Merge from origin/emacs-26

83187cd (origin/emacs-26) Skip mouse-face overlap check when mouse-fa...
a6d8f2b Fix capitalization of "Mail-Followup-To"
f9640f9 * lisp/progmodes/grep.el (grep-compute-defaults):
3a26c8a Semantic manual fixes
106a9f6 More improvements in the Emacs manual
244db85 * doc/misc/viper.texi (File and Buffer Handling): Add missing...
f0d6a16 Fix documentation of 'x-underline-at-descent-line'
69a8f45 * lisp/textmodes/flyspell.el (flyspell-get-word): Doc fix.
05214c6 Correct variable markup in manuals
355c644 Improve the "Sending Mail" chapter of Emacs manual

Conflicts:
	src/nsterm.m
	src/w32term.c

7 files changed, 15 insertions, 15 deletions

diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 8566c7c0b99..8c613080c3f 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -733,7 +733,7 @@ and an optional argument @var{marker-char} specifies the marker used.
 @findex dired-mark-suffix
 Mark all files with a certain suffix for use in later commands.  A @samp{.}
 is not automatically prepended to the string entered, you must type it
-explicitly.  This is different from @var{dired-mark-extension} which prepends
+explicitly.  This is different from @code{dired-mark-extension} which prepends
 a @samp{.} if not present.
 If invoked with prefix argument @kbd{C-u}, this command unmarks files instead.
 If called with the @kbd{C-u C-u} prefix, asks for a character to use
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 8c21a262a1e..237617a524b 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -363,7 +363,7 @@ Similarly, when you save the buffer to a @file{foo.gpg} file,
 encrypted data is written.
 
 The file name pattern for encrypted files can be controlled by
-@var{epa-file-name-regexp}.
+@code{epa-file-name-regexp}.
 
 @defvar epa-file-name-regexp
 Regexp which matches filenames treated as encrypted.
@@ -392,7 +392,7 @@ public key encryption.
 @end deffn
 
 You can also change the default behavior with the variable
-@var{epa-file-select-keys}.
+@code{epa-file-select-keys}.
 
 @defvar epa-file-select-keys
 Control whether or not to pop up the key selection dialog.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 8c2fc56dd6e..da455f3a9dd 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -15179,7 +15179,7 @@ All new mail files will get this file mode.  The default is @code{#o600}.
 @item mail-source-movemail-program
 @vindex mail-source-movemail-program
 If non-@code{nil}, name of program for fetching new mail.  If
-@code{nil}, @code{movemail} in @var{exec-directory}.
+@code{nil}, @code{movemail} in @code{exec-directory}.
 
 @end table
 
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index 9597b4b23df..8d4920ce727 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -445,7 +445,7 @@ completion lists.
 @node Tools
 @section Tools
 
-These files contain various tools a user can use.
+These files contain various tools for users.
 
 @table @file
 @item semantic-idle.el
@@ -485,8 +485,7 @@ A bunch of small minor-modes that exposes aspects of the semantic
 parser state.  Includes @code{semantic-stickyfunc-mode}.
 
 @item document.el
-@itemx document-vars.el
-Create an update comments for tags.
+Create and update comments for tags.
 
 @item semantic-adebug.el
 Extensions of @file{data-debug.el} for @semantic{}.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 6ad21359e93..5038143f77e 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -820,7 +820,7 @@ External methods save on the overhead of encoding and decoding of
 inline methods.
 
 Since external methods have the overhead of opening a new channel,
-files smaller than @var{tramp-copy-size-limit} still use inline
+files smaller than @code{tramp-copy-size-limit} still use inline
 methods.
 
 @table @asis
@@ -1219,7 +1219,7 @@ Start by using an inline method.
 External methods might be more efficient for large files, but most
 @value{tramp} users edit small files more often than large files.
 
-Enable compression, @var{tramp-inline-compress-start-size}, for a
+Enable compression, @code{tramp-inline-compress-start-size}, for a
 performance boost for large files.
 
 Since @command{ssh} has become the most common method of remote host
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index b665e6ad8a4..ed39aab2a37 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -1271,8 +1271,9 @@ operation at startup.
 @item TMPDIR
 @vindex TMPDIR
 @vindex url-temporary-directory
-If this is defined, @var{url-temporary-directory} is initialized from
-it.
+If this is defined, @code{url-temporary-directory} is initialized from
+it.  This variable was obsoleted in 23.1, please use
+@code{temporary-file-directory} instead.
 @end table
 
   The following user options affect the general operation of
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 1e6e08b8738..f45f2a03b9d 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -3579,7 +3579,7 @@ Viper customization file.  @xref{Viper Specials}, for details.
 Minibuffer can be edited similarly to Insert state, and you can switch
 between Insert/Replace/Vi states at will.
 Some users prefer plain Emacs feel in the minibuffer.  To this end, set
-@var{viper-vi-style-in-minibuffer} to @code{nil}.
+@code{viper-vi-style-in-minibuffer} to @code{nil}.
 
 @cindex Insert state
 
@@ -4063,15 +4063,15 @@ Edit <count> file, or edit files.  The count comes from @kbd{:args}.
 Like @kbd{:n}, but the meaning of the variable
 @var{ex-cycle-other-window} is reversed.
 @item :b
-Switch to another buffer.  If @var{ex-cycle-other-window} is @code{t},
+Switch to another buffer.  If @code{ex-cycle-other-window} is @code{t},
 switch in another window.  Buffer completion is supported.
-The variable @var{viper-read-buffer-function} controls which function is
+The variable @code{viper-read-buffer-function} controls which function is
 actually used to read the buffer name. The default is @code{read-buffer},
 but better alternatives are also available in Emacs (e.g.,
 @code{ido-read-buffer}).
 @vindex @var{viper-read-buffer-function}
 @item :B
-Like @kbd{:b}, but the meaning of @var{ex-cycle-other-window} is reversed.
+Like @kbd{:b}, but the meaning of @code{ex-cycle-other-window} is reversed.
 @item :<address>r <name>
 Read the file <name> into the buffer after the line <address>.
 @item v, V, C-v