; Merge from origin/emacs-26
commit4c048aaf06863057b9dd695639f70cc937b02755
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Dec 2017 05:38:05 +0000 (2 21:38 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Dec 2017 05:38:05 +0000 (2 21:38 -0800)
tree634603e56c040597c1f11fbe39fda9d6a4ba14a4
parentf1204e1dda84a65d7906949247076c6ba4d4ba40
parent34a21c3bf6205f0a3c32a8962fdd3f6a84405fe0
; Merge from origin/emacs-26

The following commit was skipped:

34a21c3bf6 ; Auto-commit of loaddefs files.