From: Glenn Morris <rgm@gnu.org>
Date: Fri, 2 Feb 2018 15:50:22 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5748
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a893a4db20e9a6cf6a03855d40d9b9dfd9c49139;p=emacs.git

Merge from origin/emacs-26

6f495ab (origin/emacs-26) Another round of manual fixups
59344c4 * doc/lispref/customize.texi (Custom Themes): Clarify .el pre...
6386efc * doc/emacs/entering.texi (Entering Emacs): Another wording fix.
e21f018 * doc/lispref/functions.texi (Inline Functions): Fix typo (Bu...
1c2fb04 * lisp/imenu.el (imenu-generic-expression): Rephrase doc (Bug...
b90e91c Fix last change of @key markup
f180075 * doc/emacs/entering.texi (Entering Emacs): Fix markup.
---

a893a4db20e9a6cf6a03855d40d9b9dfd9c49139