From: Glenn Morris <rgm@gnu.org>
Date: Tue, 14 Aug 2018 16:06:43 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4571
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e08ca25fd2cdc00dd1fa1067dd351228f58049e;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

1842297 Backport fix for Bug#32226
---

2e08ca25fd2cdc00dd1fa1067dd351228f58049e