From: Glenn Morris <rgm@gnu.org>
Date: Mon, 15 Jan 2018 21:53:40 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5872
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e141a2a1528c51494e90a3709172f52e010fc51;p=emacs.git

Merge from origin/emacs-26

c9c1add6a4 * doc/lispref/variables.texi (File Local Variables): Fix l...
752fba992b (tag: emacs-26.0.91) ; * Update ldefs-boot.el
4f46a5098d * ChangeLog.3: Update
8f705ba44d Update etc/AUTHORS
6c63204b8c Fix an entry in authors-aliases
5dd0e5c54d Mention trace.el facilities in the ELisp manual
97b0e41c5d Improve documentation of safe values of variables
a502ee9dc4 ; * doc/emacs/misc.texi (Amusements): Really add "games" t...
106bf8adc3 Improve the Emacs manual's "Misc" node
47aa85c7ec In nsterm.m use FRAME_NS_P instead of FRAME_X_P (Bug#30019)
e9e32d3475 ; * Update ldefs-boot.el
---

6e141a2a1528c51494e90a3709172f52e010fc51