Merge from origin/emacs-27

bd7b681dc4 (origin/emacs-27) Tiny texinfo markup fixes
d0dd0e0612 ; Fix more @var/@code mixups in Elisp manual
313dc0439e ; Fix another format-spec typo in the Elisp manual
9d7fd78421 Make next-error behavior a bit more flexible
0691d25295 * etc/NEWS.25: Belatedly announce upcase-dwim and downcase...
df91c94ca8 Fix access to single-byte characters in buffer text

5 files changed, 14 insertions, 13 deletions

diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index 5970e7cf801..d879f3dcadf 100644
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -663,7 +663,7 @@ definition in the future.
 Toggle whether Edebug saves and restores the outside window
 configuration (@code{edebug-toggle-save-windows}).
 
-With a prefix argument, @code{W} only toggles saving and restoring of
+With a prefix argument, @kbd{W} only toggles saving and restoring of
 the selected window.  To specify a window that is not displaying the
 source code buffer, you must use @kbd{C-x X W} from the global keymap.
 @end table
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 686dbdb1caf..574c7e5aead 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -3366,6 +3366,7 @@ each have handlers.
 file---such as the ones that implement completion of host names for
 remote file names---should have a non-@code{nil} @code{safe-magic}
 property.  For instance, Emacs normally protects directory names
+@c FIXME I don't think this means the PATH environment variable?
 it finds in @code{PATH} from becoming magic, if they look like magic
 file names, by prefixing them with @samp{/:}.  But if the handler that
 would be used for them has a non-@code{nil} @code{safe-magic}
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index 28942820793..6833af9c262 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -338,7 +338,7 @@ If the environment variable @env{EMACSLOADPATH} is set, it modifies
 the above initialization procedure.  Emacs initializes
 @code{load-path} based on the value of the environment variable.
 
-The syntax of @env{EMACSLOADPATH} is the same as used for @code{PATH};
+The syntax of @env{EMACSLOADPATH} is the same as used for @env{PATH};
 directories are separated by @samp{:} (or @samp{;}, on some
 operating systems).
 @ignore
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 8f2c7439d9f..67e44678299 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1194,7 +1194,7 @@ This function returns the full name of the logged-in user---or the value
 of the environment variable @env{NAME}, if that is set.
 
 If the Emacs process's user-id does not correspond to any known user (and
-provided @code{NAME} is not set), the result is @code{"unknown"}.
+provided @env{NAME} is not set), the result is @code{"unknown"}.
 
 If @var{uid} is non-@code{nil}, then it should be a number (a user-id)
 or a string (a login name).  Then @code{user-full-name} returns the full
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 70fb7141a1f..7c4bed04cb5 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4511,33 +4511,33 @@ would destroy these properties.  However, the latter combination is
 typically faster (@xref{Deletion}, and @ref{Insertion}).
 
 For its working, @code{replace-buffer-contents} needs to compare the
-contents of the original buffer with that of @code{source} which is a
+contents of the original buffer with that of @var{source} which is a
 costly operation if the buffers are huge and there is a high number of
 differences between them.  In order to keep
 @code{replace-buffer-contents}'s runtime in bounds, it has two
 optional arguments.
 
-@code{max-secs} defines a hard boundary in terms of seconds.  If given
+@var{max-secs} defines a hard boundary in terms of seconds.  If given
 and exceeded, it will fall back to @code{delete-region} and
 @code{insert-buffer-substring}.
 
-@code{max-costs} defines the quality of the difference computation.
-If the actual costs exceed this limit, heuristics are used to provide
-a faster but suboptimal solution.  The default value is 1000000.
+@var{max-costs} defines the quality of the difference computation.  If
+the actual costs exceed this limit, heuristics are used to provide a
+faster but suboptimal solution.  The default value is 1000000.
 
 @code{replace-buffer-contents} returns t if a non-destructive
-replacement could be performed.  Otherwise, i.e., if @code{max-secs}
+replacement could be performed.  Otherwise, i.e., if @var{max-secs}
 was exceeded, it returns nil.
 @end deffn
 
 @defun replace-region-contents beg end replace-fn &optional max-secs max-costs
-This function replaces the region between @code{beg} and @code{end}
-using the given @code{replace-fn}.  The function @code{replace-fn} is
+This function replaces the region between @var{beg} and @var{end}
+using the given @var{replace-fn}.  The function @var{replace-fn} is
 run in the current buffer narrowed to the specified region and it
 should return either a string or a buffer replacing the region.
 
 The replacement is performed using @code{replace-buffer-contents} (see
-above) which also describes the @code{max-secs} and @code{max-costs}
+above) which also describes the @var{max-secs} and @var{max-costs}
 arguments and the return value.
 
 Note: If the replacement is a string, it will be placed in a temporary
@@ -4678,7 +4678,7 @@ expanded when the header line is computed.  To do this, the
 above.  @var{specification} is an alist that has elements where the
 @code{car} is a character and the @code{cdr} is the substitution.
 
-If @code{ONLY-PRESENT} is @code{nil}, errors will be signaled if a
+If @var{only-present} is @code{nil}, errors will be signaled if a
 format character has been used that's not present in
 @var{specification}.  If it's non-@code{nil}, that format
 specification is left verbatim in the result.