; Merge from origin/emacs-26
commit2f477cbe7f7754c08e00b2b8bdceb2bc1a836db3
authorGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:26 +0000 (18 12:14 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:26 +0000 (18 12:14 -0700)
tree9a2ebfc3534cb5d0e54124c62abaa7b7075f3536
parentb455a1b2a8b927d3376e30814954a88f611a17c1
parente1284341fdc9a5d9b25339c3d47b02bc35cd8db4
; Merge from origin/emacs-26

The following commits were skipped:

e128434 Fix byte compilation of (eq foo 'default)
4753d79 Fix Bug#31846.  Do not merge with master