; Merge from origin/emacs-25
commit07fafe1edbba4a5eecbe133313b2eb6ec15e5c55
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:07:58 +0000 (1 18:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:07:58 +0000 (1 18:07 -0700)
tree37a25e04d242d85980579076be228cdeecf8d7f1
parenta8da4d033d98f6bee89f3fd3f067389705c45d4d
parentff7e201ed87d206334afedd4366deebba440efde
; Merge from origin/emacs-25

The following commit was skipped:

ff7e201 Fix bug#22891: wrong terminal width when a fringe width is zero.