Merge from origin/emacs-27

ca6a53d3bc Don't default to showing X-Faces externally in Gnus
dbf4b5b2d0 Fix manual typo in Special Read Syntax
a9fe6dfa90 Fix problem with emacs -nw / eww / svg
0de63092c8 Clarify base64 requirements and say what {en,de}code_codin...
6184aa003f ; * etc/NEWS: Fix boring oddities.
51ea32dd12 * src/emacs-module.h.in: Add reference to manual.
75d0cef20d Trivial docstring fixes
ee12c421b6 imagemagick-types needs to initialize ImageMagick

# Conflicts:
#	etc/NEWS

18 files changed, 150 insertions, 116 deletions

diff --git a/ChangeLog.3 b/ChangeLog.3
index 27df42cec4d..9f2f8ced227 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -3,7 +3,6 @@
         * etc/AUTHORS: Update.
 
 2019-08-29  Nicolas Petton  <nicolas@petton.fr>
-2019-08-29  Nicolas Petton  <nicolas@petton.fr>
 
         * etc/NEWS: Delete temporary markup.
 
@@ -64939,7 +64938,8 @@
 
         (eww-setup-buffer): Restore left-to-right defaults
 
-        * eww.el (eww-setup-buffer): Restore left-to-right defaults.
+        * lisp/net/eww.el (eww-setup-buffer): Restore left-to-right
+        defaults.
 
 2015-12-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -64955,7 +64955,8 @@
 
 2015-12-26  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * shr.el (shr-descend): Allow using lambdas in external functions.
+        * lisp/net/shr.el (shr-descend): Allow using lambdas in external
+        functions.
 
 2015-12-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -65022,7 +65023,8 @@
 
 2015-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * eww.el (eww-display-html): Support <button> tags (bug#20485).
+        * lisp/net/eww.el (eww-display-html): Support <button> tags
+        (bug#20485).
 
 2015-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -65048,7 +65050,8 @@
 
 2015-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * eww.el (eww-mode-map): Fix command name of eww-toggle-colors.
+        * lisp/net/eww.el (eww-mode-map): Fix command name of
+        eww-toggle-colors.
 
 2015-12-25  Samer Masterson  <samer@samertm.com>
 
@@ -65072,38 +65075,39 @@
 
         Follow meta refresh tags in eww
 
-        * eww.el (eww-tag-meta): Follow meta refresh tags (bug#22234).
+        * lisp/net/eww.el (eww-tag-meta): Follow meta refresh tags
+        (bug#22234).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
         More eww file name coding fixes
 
-        * eww.el (eww-decode-url-file-name): Use the base coding
+        * lisp/net/eww.el (eww-decode-url-file-name): Use the base coding
         system to check for encodability.
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
         Always save eww history
 
-        * eww.el (eww-setup-buffer): Always save history, even when
-        called from outside the eww buffer (bug#19638).
+        * lisp/net/eww.el (eww-setup-buffer): Always save history, even
+        when called from outside the eww buffer (bug#19638).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
         Default web pages to right-to-left
 
-        * eww.el (eww-mode): Most web pages are left-to-right, so make
-        that the default (bug#19801).
+        * lisp/net/eww.el (eww-mode): Most web pages are left-to-right,
+        so make that the default (bug#19801).
 
-        * shr.el (shr-tag-html): Respect "dir" attributes
+        * lisp/net/shr.el (shr-tag-html): Respect "dir" attributes
         (left-to-right, right-to-left).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
         Make toggling checkboxes work again
 
-        * eww.el (eww-update-field): Make toggling checkboxes work
-        again (bug#21881).
+        * lisp/net/eww.el (eww-update-field): Make toggling checkboxes
+        work again (bug#21881).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -65118,8 +65122,8 @@
 
         Fixes: 22117
 
-        * shr.el (shr-descend): Stop rendering before we run out of
-        specpdl room (bug#22117).
+        * lisp/net/shr.el (shr-descend): Stop rendering before we run out
+        of specpdl room (bug#22117).
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -65129,7 +65133,7 @@
 
         Allow several <tbody> tags in shr
 
-        * shr.el (shr-table-body): New function to find the real body
+        * lisp/net/shr.el (shr-table-body): New function to find the real body
         of a table.
         (shr-tag-table): Use it to render several <tbody> tags in a
         table (bug#22170).
@@ -65145,7 +65149,7 @@
 
         Decode hex-encoded URLs before using them as file names
 
-        * eww.el (eww-decode-url-file-name): New function.
+        * lisp/net/eww.el (eww-decode-url-file-name): New function.
         (eww-download-callback): Use it to decode file names before
         saving them.
 
@@ -65162,23 +65166,23 @@
 
         Allow overriding shr functions from eww
 
-        * eww.el (eww-display-html): Allow overriding elements in
+        * lisp/net/eww.el (eww-display-html): Allow overriding elements in
         `shr-external-rendering-functions'.
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
         Ignore invalid SVG images
 
-        * shr.el (shr-tag-svg): Ignore SVG images that have no width
-        or height, because these can't be displayed by ImageMagick,
+        * lisp/net/shr.el (shr-tag-svg): Ignore SVG images that have no
+        width or height, because these can't be displayed by ImageMagick,
         anyway.
 
 2015-12-24  Lars Ingebrigtsen  <larsi@gnus.org>
 
         shr table rendering fix
 
-        * shr.el (shr-tag-table): Allow rendering body-less tables
-        that have headers.
+        * lisp/net/shr.el (shr-tag-table): Allow rendering body-less
+        tables that have headers.
 
 2015-12-22  Sam Steingold  <sds@gnu.org>
 
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index e948814d1f7..e493210f92f 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -160,7 +160,7 @@ Skip the next @samp{N} characters (@pxref{Comments}).
 @samp{N} represented as a binary number (@samp{#b101010}).
 
 @item #(@dots{})
-A string text properties (@pxref{Text Props and Strings}).
+String text properties (@pxref{Text Props and Strings}).
 
 @item #^
 A char table (@pxref{Char-Table Type}).
diff --git a/etc/NEWS.27 b/etc/NEWS.27
index 2b0622e752f..cdd94271c9e 100644
--- a/etc/NEWS.27
+++ b/etc/NEWS.27
@@ -256,8 +256,8 @@ The default value is 30000, as the previously hard-coded threshold.
 ** The function 'read-passwd' uses "*" as default character to hide passwords.
 
 ** The function 'read-answer' now accepts not only single character
-answers, but also function keys like F1, character events such as C-M-h,
-and control characters like C-h.
+answers, but also function keys like 'F1', character events such as
+'C-M-h', and control characters like 'C-h'.
 
 ** Lexical binding is now used when evaluating interactive Elisp forms.
 More specifically, lexical-binding is now used for 'M-:', '--eval', as
@@ -350,7 +350,7 @@ certificates via 'auth-source'.
 ** New user option 'network-stream-use-client-certificates'.
 When non-nil, 'open-network-stream' performs lookups of client
 certificates using 'auth-source' as if ':client-certificate t' were
-specified iff there is no explicit ':client-certificate' parameter.
+specified if there is no explicit ':client-certificate' parameter.
 Defaults to nil.
 
 +++
@@ -419,14 +419,14 @@ respects display actions specified by 'display-buffer-alist' and
 'display-buffer-overriding-action'.
 
 +++
-** The option 'switch-to-visible-buffer' is now obsolete.
+** The user option 'switch-to-visible-buffer' is now obsolete.
 Customize 'switch-to-prev-buffer-skip' instead.
 
 +++
-** New option 'switch-to-prev-buffer-skip'.
-This option allows to specify the set of buffers that may be shown by
-'switch-to-prev-buffer' and 'switch-to-next-buffer' more stringently
-than the now obsolete 'switch-to-visible-buffer'.
+** New user option 'switch-to-prev-buffer-skip'.
+This user option allows to specify the set of buffers that may be
+shown by 'switch-to-prev-buffer' and 'switch-to-next-buffer' more
+stringently than the now obsolete 'switch-to-visible-buffer'.
 
 ** New 'flex' completion style
 An implementation of popular "flex/fuzzy/scatter" completion which
@@ -535,8 +535,8 @@ their own separated input history list if desired.
 
 ** 'backup-by-copying-when-privileged-mismatch' applies to file gid, too.
 In addition to checking the file owner uid, Emacs also checks that the
-group gid is not greater than backup-by-copying-when-privileged-mismatch;
-if so, backup-by-copying-when-mismatch will be forced on.
+group gid is not greater than 'backup-by-copying-when-privileged-mismatch';
+if so, 'backup-by-copying-when-mismatch' will be forced on.
 
 
 * Editing Changes in Emacs 27.1
@@ -660,10 +660,10 @@ re-fontifies the buffer.
 ** Font Lock is smarter about fontifying unterminated strings and comments.
 When you type a quote that starts a string, or a comment delimiter
 that starts a comment, font-lock will not immediately refontify the
-following characters in font-lock-string-face or
-font-lock-comment-face.  Instead, it will delay the fontification
+following characters in 'font-lock-string-face' or
+'font-lock-comment-face'.  Instead, it will delay the fontification
 beyond the current line to give you a chance to close the string or
-comment.  This is controlled by the new customizable variable
+comment.  This is controlled by the new user option
 'jit-lock-antiblink-grace', which specifies the delay in seconds.  The
 default is 2 seconds; set to nil to get back the old behavior.
 
@@ -784,7 +784,7 @@ the minibuffer.  If non-nil, point will move to the end of the prompt
 +++
 *** When the minibuffer is active, echo-area messages are displayed at
 the end of the minibuffer instead of hiding the minibuffer by the echo
-area display.  The new option 'minibuffer-message-clear-timeout'
+area display.  The new user option 'minibuffer-message-clear-timeout'
 controls how messages displayed in this situation are removed from the
 minibuffer.
 
@@ -795,8 +795,8 @@ at the end of the active minibuffer.
 +++
 *** 'y-or-n-p' now uses the minibuffer to read 'y' or 'n' answer.
 
-*** Some commands that previously used read-char-choice now read
-a character using the minibuffer by read-char-from-minibuffer.
+*** Some commands that previously used 'read-char-choice' now read
+a character using the minibuffer by 'read-char-from-minibuffer'.
 
 ** map.el
 *** Now also understands plists.
@@ -807,7 +807,7 @@ a character using the minibuffer by read-char-from-minibuffer.
 *** New generic function 'map-insert'.
 
 +++
-*** The 'type' arg can be a list '(hash-table :key1 VAL1 :key2 VAL2 ...)'
+*** The 'type' arg can be a list '(hash-table :key1 VAL1 :key2 VAL2 ...)'.
 
 ** seq.el
 New convenience functions 'seq-first' and 'seq-rest' give easy access
@@ -943,9 +943,9 @@ The default value is 'find-dired-sort-by-filename'.
 
 ---
 *** New user option 'vc-tor'.
-When non-nil, this option causes the VC commands to communicate with
-the repository via Tor's proxy, using the 'torsocks' wrapper script.
-The default is nil.
+When non-nil, this user option causes the VC commands to communicate
+with the repository via Tor's proxy, using the 'torsocks' wrapper
+script.  The default is nil.
 
 +++
 *** New command 'log-edit-generate-changelog-from-diff', bound to 'C-c C-w'.
@@ -1131,16 +1131,16 @@ end.
 *** 'comint-run' can now accept a list of switches to pass to the program.
 'C-u M-x comint-run' will prompt for the switches interactively.
 
-*** Abnormal hook `comint-password-function' has been added.
+*** Abnormal hook 'comint-password-function' has been added.
 This hook permits a derived mode to supply a password for the
 underlying command interpreter without prompting the user.  For
-example, in sql-mode, the password for connecting to the database may
+example, in 'sql-mode', the password for connecting to the database may
 be stored in the connection wallet and may be passed on the command
 line to start the SQL interpreter.  This is a potential security flaw
 that could expose user's database passwords on the command line
 through the use of a process list (Bug#8427).  With this hook, it is
 possible to not pass the password on the command line and wait for the
-program to prompt for the password.  When it does so, the password cam
+program to prompt for the password.  When it does so, the password can
 be supplied to the SQL interpreter without involving the user just as
 if it had been supplied on the command line.
 
@@ -1150,7 +1150,7 @@ if it had been supplied on the command line.
 SQL Mode now supports the ELPA 'sql-indent' package for assisting
 sophisticated SQL indenting rules.  Note, however, that SQL is not
 like other programming languages like C, Java, or Python where code is
-sparse and rules for formatting are fairly well established. Instead
+sparse and rules for formatting are fairly well established.  Instead
 SQL is more like COBOL (from which it came) and code tends to be very
 dense and line ending decisions driven by syntax and line length
 considerations to make readable code.  Experienced SQL developers may
@@ -1164,17 +1164,18 @@ indentation support in 'sql-mode' and 'sql-interactive-mode'.
 
 **** 'sql-mode-hook' and 'sql-interactive-mode-hook' changed.
 Both hook variables have had 'sql-indent-enable' added to their
-default values. If you have existing customizations to these variables,
-you should make sure that the new default entry is included.
+default values.  If you have existing customizations to these
+variables, you should make sure that the new default entry is
+included.
 
 *** Connection Wallet
 Database passwords can now by stored in NETRC or JSON data files that
-may optionally be encrypted. When establishing an interactive session
+may optionally be encrypted.  When establishing an interactive session
 with the database via 'sql-connect' or a product specific function,
 like 'sql-mysql' or 'my-postgres', the password wallet will be
-searched for the password. The 'sql-product', 'sql-server',
+searched for the password.  The 'sql-product', 'sql-server',
 'sql-database', and the 'sql-username' will be used to identify the
-appropriate authorization. This eliminates the discouraged practice of
+appropriate authorization.  This eliminates the discouraged practice of
 embedding database passwords in your Emacs initialization.
 
 See the 'auth-source' module for complete documentation on the file
@@ -1254,7 +1255,7 @@ Example use in auctex.el: '(defconst auctex-version (package-get-version))'
 When 'package-quickstart' is non-nil, package.el precomputes a big
 autoloads file so that activation of packages can be done much faster,
 which can speed up your startup significantly.
-It also causes variables like 'package-user-dir' and
+It also causes user options like 'package-user-dir' and
 'package-load-list' to be consulted when 'package-quickstart-refresh'
 is run rather than at startup so you don't need to set them in your
 early init file.
@@ -1281,7 +1282,7 @@ the 'package-menu-clear-filter' function, bound to '/ /' by default.
 *** In Package Menu, 'g' now updates package data from archives.
 Previously, 'g' invoked 'tabulated-list-revert' which did not update
 the cached archive data.  It is now bound to 'revert-buffer', which
-will now update the data.
+will update the data.
 
 'package-menu-refresh' is an obsolete alias for 'revert-buffer'.
 
@@ -1306,7 +1307,6 @@ of columns passed to the 'man' program for formatting man pages.  This
 is to enhance readability when man pages are displayed in very wide
 windows (which are customary with today's large displays).
 
-
 ** Xref
 
 +++
@@ -1348,9 +1348,9 @@ A new command 'xref-revert-buffer' is bound to 'g'.
 +++
 *** New minor mode Fido mode.
 This mode is based on Icomplete, and its name stands for "Fake Ido".
-The point of this mode is to be an ido-mode workalike, but provide
+The point of this mode is to be an 'ido-mode' workalike, but provide
 most of the functionality present in Icomplete that is not in
-ido-mode, while being much more compatible with all of Emacs's
+'ido-mode', while being much more compatible with all of Emacs's
 completion facilities.
 
 ** Ecomplete
@@ -1582,9 +1582,8 @@ killed when pdbtracking session is finished.
 
 ---
 *** New function 'python-shell-send-region'.
-It send the statement delimited by 'python-nav-beginning-of-statement' and
-'python-nav-end-of-statement' to the inferior Python process.
-
+It sends the statement delimited by 'python-nav-beginning-of-statement'
+and 'python-nav-end-of-statement' to the inferior Python process.
 
 ** Help
 
@@ -1737,7 +1736,7 @@ previously-set breakpoints.  If the code has changed substantially,
 this may not be possible.
 
 +++
-*** New command 'edebug-remove-instrumentation.
+*** New command 'edebug-remove-instrumentation'.
 This command removes Edebug instrumentation from all functions that
 have been instrumented.
 
@@ -1996,7 +1995,7 @@ GnuTLS manual) is recommended instead.
 
 ** Message
 
-*** Completion of email addresses can use the standard completion UI
+*** Completion of email addresses can use the standard completion UI.
 This is controlled by 'message-expand-name-standard-ui'.
 With the standard UI the different sources (ecomplete, bbdb, and eudc)
 are matched together and try to obey 'completion-styles'.
@@ -2034,11 +2033,11 @@ set gpg's "--sender email@domain" option.
 The option is useful for two reasons when verifying the signature:
 
  1. GnuPG's TOFU statistics are updated for the specific user id
-    (email) only. See gpg(1) man page about "--sender".
+    (email) only.  See gpg(1) man page about "--sender".
 
  2. GnuPG's '--auto-key-retrieve' functionality can use WKD (web key
-    directory) method for finding the signer's key. You need GnuPG
-    2.2.17 to fully benefit from this feature. See gpg(1) man page for
+    directory) method for finding the signer's key.  You need GnuPG
+    2.2.17 to fully benefit from this feature.  See gpg(1) man page for
     '--auto-key-retrieve'.
 
 ---
@@ -2056,8 +2055,8 @@ been removed.  Use 'encode-coding-string', 'decode-coding-string', and
 
 *** 'epg-context' structure supports now 'sender' slot.
 The value of the new 'sender' slot (if a string) is used to set gpg's
-'--sender' option. This feature is used by
-'mml-secure-openpgp-sign-with-sender'. See gpg(1) manual page about
+'--sender' option.  This feature is used by
+'mml-secure-openpgp-sign-with-sender'.  See gpg(1) manual page about
 '--sender' for more information.
 
 ---
@@ -2135,11 +2134,11 @@ the 128...255 range, as expected.
 
 ---
 *** The rx 'or' and 'seq' forms no longer require any arguments.
-(or) produces a regexp that never matches anything, while (seq)
+'(or)' produces a regexp that never matches anything, while '(seq)'
 matches the empty string, each being an identity for the operation.
 This also works for their aliases: '|' for 'or'; ':', 'and' and
 'sequence' for 'seq'.
-The symbol 'unmatchable' can be used as an alternative to (or).
+The symbol 'unmatchable' can be used as an alternative to '(or)'.
 
 ---
 *** 'regexp' and new 'literal' accept arbitrary lisp as arguments.
@@ -2427,16 +2426,16 @@ if you set 'time-stamp-format' or 'time-stamp-pattern' with a
 file-local variable, you may need to update the value.
 
 ** mode-local
-*** Declare 'define-overload' and 'define-child-mode' as obsolete
-*** Rename several internal functions to use a ''mode-local-' prefix
+*** Declare 'define-overload' and 'define-child-mode' as obsolete.
+*** Rename several internal functions to use a 'mode-local-' prefix.
 
 ** CC Mode
 
 +++
-*** You can now flag "wrong style" comments with font-lock-warning-face.
-To do this, use c-toggle-comment-style, if needed, to set the desired
-default comment style (block or line); then set the option
-c-mark-wrong-style-of-comment to non-nil.
+*** You can now flag "wrong style" comments with 'font-lock-warning-face'.
+To do this, use 'c-toggle-comment-style', if needed, to set the desired
+default comment style (block or line); then set the user option
+'c-mark-wrong-style-of-comment' to non-nil.
 
 
 * New Modes and Packages in Emacs 27.1
@@ -2539,7 +2538,6 @@ the hook may have specified higher/lower depths.  This makes it
 possible to control the ordering of functions more precisely, as was
 already possible in 'add-function' and 'advice-add'.
 
-
 ** In 'compilation-error-regexp-alist' the old undocumented feature
 where 'line' could be a function of 2 arguments has been dropped.
 
@@ -2725,7 +2723,7 @@ scrolling.
 where it scales the image under the mouse pointer.
 
 ---
-** help-follow-symbol now signals 'user-error' if point (or the
+** 'help-follow-symbol' now signals 'user-error' if point (or the
 position pointed to by the argument POS) is not in a symbol.
 
 
@@ -2856,9 +2854,9 @@ functions like 'process-id' that compute process IDs, and functions like
 'user-uid' and 'group-gid' that compute user and group IDs.
 
 +++
-** overflow-error is now documented as a subcategory of range-error.
+** 'overflow-error' is now documented as a subcategory of 'range-error'.
 Formerly it was undocumented, and was (incorrectly) a subcategory
-of domain-error.
+of 'domain-error'.
 
 ** Time values
 
@@ -3159,7 +3157,7 @@ are implemented in C using the Jansson library.
 
 +++
 ** New function 'flatten-tree'.
-'flatten-list' is provided as an alias. These functions take a tree
+'flatten-list' is provided as an alias.  These functions take a tree
 and 'flatten' it such that the result is a list of all the terminal
 nodes.
 
@@ -3367,7 +3365,7 @@ non-nil.  This is used by 'mouse-drag-region' to make the effect
 easier to undo immediately afterwards.
 
 ---
-** When called interactively, next-buffer and previous-buffer now
+** When called interactively, 'next-buffer' and 'previous-buffer' now
 signal 'user-error' if there is no buffer to switch to.
 
 
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index d3cbe610a79..926d7f24b43 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -80,8 +80,7 @@
   "Collection of any errors thrown during analysis.")
 
 (defun semantic-analyze-push-error (err)
-  "Push the error in ERR-DATA onto the error stack.
-Argument ERR."
+  "Push the error data in ERR onto the error stack."
   (push err semantic-analyze-error-stack))
 
 ;;; Analysis Classes
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index a5ecf33203c..a7a1d91f3f1 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2017,7 +2017,7 @@ a `let' form, except that the list of symbols can be computed at run-time."
 Each definition can take the form (FUNC EXP) where
 FUNC is the function name, and EXP is an expression that returns the
 function value to which it should be bound, or it can take the more common
-form \(FUNC ARGLIST BODY...) which is a shorthand
+form (FUNC ARGLIST BODY...) which is a shorthand
 for (FUNC (lambda ARGLIST BODY)).
 
 FUNC is defined only within FORM, not BODY, so you can't write
diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index 74927b6224f..c1db79809d1 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -141,7 +141,8 @@ In the base definition, MAP can be an alist, hash-table, or array."
   "Associate KEY with VALUE in MAP and return VALUE.
 If KEY is already present in MAP, replace the associated value
 with VALUE.
-When MAP is a list, test equality with TESTFN if non-nil, otherwise use `eql'.
+When MAP is a list, test equality with TESTFN if non-nil,
+otherwise use `eql'.
 
 MAP can be a list, hash-table or array."
   (declare (obsolete "use map-put! or (setf (map-elt ...) ...) instead" "27.1"))
@@ -287,7 +288,7 @@ The default implementation delegates to `map-length'."
   ;; so specifying `testfn' here is problematic: e.g. for hash-tables
   ;; we shouldn't use `gethash' unless `testfn' is the same as the map's own
   ;; test function!
-  "Return non-nil If and only if MAP contains KEY.
+  "Return non-nil if and only if MAP contains KEY.
 TESTFN is deprecated.  Its default depends on MAP.
 The default implementation delegates to `map-do'."
   (unless testfn (setq testfn #'equal))
@@ -325,7 +326,7 @@ The default implementation delegates to `map-apply'."
     nil))
 
 (cl-defgeneric map-every-p (pred map)
-  "Return non-nil if (PRED key val) is non-nil for all elements of the map MAP.
+  "Return non-nil if (PRED key val) is non-nil for all elements of MAP.
 The default implementation delegates to `map-apply'."
   ;; FIXME: Not sure if there's much benefit to defining it as defgeneric,
   ;; since as defined, I can't think of a map-type where we could provide an
@@ -475,8 +476,8 @@ KEYWORD-ARGS are forwarded to `make-hash-table'."
 
 (cl-defmethod map-into (map (type (head hash-table)))
   "Convert MAP into a hash-table.
-TYPE is a list where the car is `hash-table' and the cdr are the keyword-args
-forwarded to `make-hash-table'.
+TYPE is a list where the car is `hash-table' and the cdr are the
+keyword-args forwarded to `make-hash-table'.
 
 Example:
     (map-into '((1 . 3)) '(hash-table :test eql))"
diff --git a/lisp/filesets.el b/lisp/filesets.el
index c05fff3fb74..5a810f14ac5 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -139,7 +139,7 @@ the default for XEmacs prior to 21.5.  If you want to change this value
 put \"(setq filesets-menu-ensure-use-cached VALUE)\" into your startup
 file -- before loading filesets.el.
 
-So, when should you think about setting this value to t? If filesets.el
+So, when should you think about setting this value to t?  If filesets.el
 is loaded before user customizations.  Thus, if (require \\='filesets)
 precedes the `custom-set-variables' command or, for XEmacs, if init.el
 is loaded before custom.el, set this variable to t.")
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5745bf12bde..a937e232ff4 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -268,21 +268,15 @@ This can also be a list of the above values."
   :type 'plist
   :group 'gnus-article-hiding)
 
-;; Fixme: This isn't the right thing for mixed graphical and non-graphical
-;; frames in a session.
-(defcustom gnus-article-x-face-command
-  (if (gnus-image-type-available-p 'pbm)
-      'gnus-display-x-face-in-from
-    "{ echo \
-'/* Format_version=1, Width=48, Height=48, Depth=1, Valid_bits_per_item=16 */'\
-; uncompface; } | icontopbm | display -")
+(defcustom gnus-article-x-face-command (and (gnus-image-type-available-p 'pbm)
+                                            'gnus-display-x-face-in-from)
   "String or function to be executed to display an X-Face header.
 If it is a string, the command will be executed in a sub-shell
 asynchronously.  The compressed face will be piped to this command."
   :type '(choice string
                  (function-item gnus-display-x-face-in-from)
                  function)
-  :version "21.1"
+  :version "27.1"
   :group 'gnus-picon
   :group 'gnus-article-washing)
 
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 22d4cde34a7..97f8bed88c1 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1197,7 +1197,8 @@ Return a string with image data."
              (libxml-parse-xml-region (point) (point-max)) 'utf-8)))
     ;; SVG images often do not have a specified foreground/background
     ;; color, so wrap them in styles.
-    (when (eq content-type 'image/svg+xml)
+    (when (and (display-images-p)
+               (eq content-type 'image/svg+xml))
       (setq data (svg--wrap-svg data)))
     (list data content-type)))
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 197d52b2dea..718e6e44e04 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -2629,7 +2629,7 @@ region and the first line of the next region."
   "Display this many lines of leading context before the current message.
 If nil or t, and the left fringe is displayed, don't scroll the
 compilation output window; an arrow in the left fringe points to
-the current message.  With no left fringe, If nil, the message
+the current message.  With no left fringe, if nil, the message
 scrolls to the top of the window; there is no arrow.  If t, don't
 scroll the compilation output window at all; an arrow before
 column zero points to the current message."
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 4665500349a..d79c589955c 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -381,7 +381,7 @@ terms (if this variable is nil, default)."
 
 (defcustom prolog-paren-indent 4
   "The indentation increase for parenthesis expressions.
-Only used in ( If -> Then ; Else) and ( Disj1 ; Disj2 ) style expressions."
+Only used in ( If -> Then ; Else ) and ( Disj1 ; Disj2 ) style expressions."
   :version "24.1"
   :group 'prolog-indentation
   :type 'integer
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index aa42873a3dd..7a51739c5f3 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -860,7 +860,7 @@ The specified function will be called as:
   (wallet-func WALLET PRODUCT USER SERVER DATABASE PORT)
 
 It is expected to return either a string containing the password,
-a function returning the password, or nil, If you want to support
+a function returning the password, or nil.  If you want to support
 another format of password file, then implement a different
 search wallet function and identify the location of the password
 store with `sql-password-wallet'.")
diff --git a/lisp/term.el b/lisp/term.el
index 50a0c80bcfd..29898dfce94 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -87,7 +87,7 @@
 ;; for maintenance reasons, you have to edit files 'as root': before
 ;; patching term.el, I su-ed in a term.el buffer and used vi :), now I
 ;; simply do a C-x C-f and, via ange-ftp, the file is automatically loaded
-;; 'as-root'.  ( If you don't want to enter the root password every time you
+;; 'as-root'.  (If you don't want to enter the root password every time you
 ;; can put it in your .netrc: note that this is -not- advisable if you're
 ;; connected to the internet or if somebody else works on your workstation!)
 ;;
diff --git a/src/coding.c b/src/coding.c
index d9964908dce..35d6be470c8 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9415,6 +9415,13 @@ code_convert_region (Lisp_Object start, Lisp_Object end,
 DEFUN ("decode-coding-region", Fdecode_coding_region, Sdecode_coding_region,
        3, 4, "r\nzCoding system: ",
        doc: /* Decode the current region from the specified coding system.
+
+What's meant by \"decoding\" is transforming bytes into text
+(characters).  If, for instance, you have a region that contains data
+that represents the two bytes #xc2 #xa9, after calling this function
+with the utf-8 coding system, the region will contain the single
+character ?\\N{COPYRIGHT SIGN}.
+
 When called from a program, takes four arguments:
         START, END, CODING-SYSTEM, and DESTINATION.
 START and END are buffer positions.
@@ -9438,6 +9445,13 @@ not fully specified.)  */)
 DEFUN ("encode-coding-region", Fencode_coding_region, Sencode_coding_region,
        3, 4, "r\nzCoding system: ",
        doc: /* Encode the current region by specified coding system.
+
+What's meant by \"encoding\" is transforming textual data (characters)
+into bytes.  If, for instance, you have a region that contains the
+single character ?\\N{COPYRIGHT SIGN}, after calling this function with
+the utf-8 coding system, the data in the region will represent the two
+bytes #xc2 #xa9.
+
 When called from a program, takes four arguments:
         START, END, CODING-SYSTEM and DESTINATION.
 START and END are buffer positions.
diff --git a/src/emacs-module.h.in b/src/emacs-module.h.in
index a4312730143..ecbfe28c72c 100644
--- a/src/emacs-module.h.in
+++ b/src/emacs-module.h.in
@@ -17,6 +17,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/*
+This file defines the Emacs module API.  Please see the chapter
+`Dynamic Modules' in the GNU Emacs Lisp Reference Manual for
+information how to write modules and use this header file.
+*/
+
 #ifndef EMACS_MODULE_H
 #define EMACS_MODULE_H
 
diff --git a/src/fns.c b/src/fns.c
index 3ae3192b3d5..5e62d0e6f90 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3297,7 +3297,13 @@ static Lisp_Object base64_encode_string_1 (Lisp_Object, bool,
 DEFUN ("base64-encode-region", Fbase64_encode_region, Sbase64_encode_region,
        2, 3, "r",
        doc: /* Base64-encode the region between BEG and END.
-Return the length of the encoded text.
+The data in the region is assumed to represent bytes, not text.  If
+you want to base64-encode text, the text has to be converted into data
+first by using `encode-coding-region' with the appropriate coding
+system first.
+
+Return the length of the encoded data.
+
 Optional third argument NO-LINE-BREAK means do not break long lines
 into shorter lines.  */)
   (Lisp_Object beg, Lisp_Object end, Lisp_Object no_line_break)
@@ -3544,7 +3550,13 @@ base64_encode_1 (const char *from, char *to, ptrdiff_t length,
 DEFUN ("base64-decode-region", Fbase64_decode_region, Sbase64_decode_region,
        2, 3, "r",
        doc: /* Base64-decode the region between BEG and END.
-Return the length of the decoded text.
+Return the length of the decoded data.
+
+Note that after calling this function, the data in the region will
+represent bytes, not text.  If you want to end up with text, you have
+to call `decode-coding-region' afterwards with an appropriate coding
+system.
+
 If the region can't be decoded, signal an error and don't modify the buffer.
 Optional third argument BASE64URL determines whether to use the URL variant
 of the base 64 encoding, as defined in RFC 4648.  */)
diff --git a/src/image.c b/src/image.c
index 70d932f9edb..fc90c5ea74b 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8603,6 +8603,17 @@ extern WandExport void PixelGetMagickColor (const PixelWand *,
                                             MagickPixelPacket *);
 #endif
 
+static void
+imagemagick_initialize (void)
+{
+  static bool imagemagick_initialized;
+  if (!imagemagick_initialized)
+    {
+      imagemagick_initialized = true;
+      MagickWandGenesis ();
+    }
+}
+
 /* Log ImageMagick error message.
    Useful when an ImageMagick function returns the status `MagickFalse'.  */
 
@@ -8874,14 +8885,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
   double rotation;
   char hint_buffer[MaxTextExtent];
   char *filename_hint = NULL;
-
-  /* Initialize the ImageMagick environment.  */
-  static bool imagemagick_initialized;
-  if (!imagemagick_initialized)
-    {
-      imagemagick_initialized = true;
-      MagickWandGenesis ();
-    }
+  imagemagick_initialize ();
 
   /* Handle image index for image types who can contain more than one image.
      Interface :index is same as for GIF.  First we "ping" the image to see how
@@ -9290,6 +9294,7 @@ and `imagemagick-types-inhibit'.  */)
   char **imtypes;
   size_t i;
 
+  imagemagick_initialize ();
   ex = AcquireExceptionInfo ();
   imtypes = GetMagickList ("*", &numf, ex);
   DestroyExceptionInfo (ex);
diff --git a/src/syntax.c b/src/syntax.c
index edfdae22590..0f539da328a 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -2280,7 +2280,7 @@ in_classes (int c, Lisp_Object iso_classes)
      for nested comments and should be zero or negative else.
      ST_COMMENT_STYLE cannot be nested.
    PREV_SYNTAX is the SYNTAX_WITH_FLAGS of the previous character
-     (or 0 If the search cannot start in the middle of a two-character).
+     (or 0 if the search cannot start in the middle of a two-character).
 
    If successful, return true and store the charpos of the comment's
    end into *CHARPOS_PTR and the corresponding bytepos into