; Merge from origin/emacs-26
commitfae6cdc8ab0c9becd37afd9c31da56fecfad947b
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:22:27 +0000 (8 19:22 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Nov 2017 03:22:27 +0000 (8 19:22 -0800)
tree1c98a8e6b702bc3b10fab1d8a2ade1fda4f938a6
parent8d99e233147d44c2176cef599db754d06b12f5e3
parent73d670751a633fa478d97fb1bfdab2a753c9b2d2
; Merge from origin/emacs-26

The following commit was skipped:

73d670751a Fix to 2fddfb7ce7