From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 9 Nov 2017 03:22:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6171
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fae6cdc8ab0c9becd37afd9c31da56fecfad947b;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

73d670751a Fix to 2fddfb7ce7
---

fae6cdc8ab0c9becd37afd9c31da56fecfad947b