; Merge from origin/emacs-25

The following commit was skipped:

ff7e201 Fix bug#22891: wrong terminal width when a fringe width is zero.
This commit is contained in:
Paul Eggert 2016-05-01 18:07:58 -07:00
commit 07fafe1edb

Diff content is not available