Merge from origin/emacs-26
commit9f56d04df40cac6767b7fbed89737ce9f03f5d80
authorGlenn Morris <rgm@gnu.org>
Sat, 24 Feb 2018 17:44:13 +0000 (24 09:44 -0800)
committerGlenn Morris <rgm@gnu.org>
Sat, 24 Feb 2018 17:44:13 +0000 (24 09:44 -0800)
treebacd9595102c592a96a1369f234c71afbd5fa8a2
parent80c2bf6e1684a05b7cdc00f4c4eba89841911c76
parent560a23e1dab7a6a203a4a70b3925a87d6cfddf76
Merge from origin/emacs-26

560a23e (origin/emacs-26) Document reserved keys
b0be19b ; * doc/emacs/xresources.texi (Table of Resources): Fix last ...
doc/emacs/custom.texi