From: John Wiegley <johnw@newartisans.com>
Date: Mon, 25 Jun 2018 19:09:44 +0000 (-0700)
Subject: Merge branch 'master' into patch-1
X-Git-Tag: emacs-29.0.90~1306^2~15^2~67^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fb369c968;p=emacs.git

Merge branch 'master' into patch-1
---

5fb369c96847191c3ded14fc3c1cdc462eac416c