From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 May 2016 01:07:58 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2025
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07fafe1edbba4a5eecbe133313b2eb6ec15e5c55;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

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

07fafe1edbba4a5eecbe133313b2eb6ec15e5c55