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.

3 files changed, 5 insertions, 3 deletions

diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 6c7ca260abc..7fea507fd03 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -1432,7 +1432,9 @@ where the list entries have the same meanings as in
 would be evaluated when loading the theme, but that is bad form.
 To protect against loading themes containing malicious code, Emacs
 displays the source file and asks for confirmation from the user
-before loading any non-built-in theme for the first time.
+before loading any non-built-in theme for the first time.  As
+such, themes are not ordinarily byte-compiled, and source files
+always take precedence when Emacs is looking for a theme to load.
 
   The following functions are useful for programmatically enabling and
 disabling themes:
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index bd1f671225c..fbf943a08c7 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4599,7 +4599,7 @@ first character in the group of consecutive characters that have the
 same @code{display} property.  The space width is the pixel width of
 that character, multiplied by @var{factor}.  (On text-mode terminals,
 the ``pixel width'' of a character is usually 1, but it could be more
-for @key{TAB}s and double-width CJK characters.)
+for TABs and double-width CJK characters.)
 
 @item :align-to @var{hpos}
 Specifies that the space should be wide enough to reach @var{hpos}.
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index c3e5dc0eb5b..9090956d837 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -2098,7 +2098,7 @@ to verify that using @code{defun} actually has performance problems.
   After an inline function is defined, its inline expansion can be
 performed later on in the same file, just like macros.
 
-  It's possible to use @code{defsubst} to define a macro to expand
+  It's possible to use @code{defmacro} to define a macro to expand
 into the same code that an inline function would execute
 (@pxref{Macros}).  But the macro would be limited to direct use in
 expressions---a macro cannot be called with @code{apply},