Merge from origin/emacs-26

f2caf08ca6 ; Spelling fixes
f0e5f220b6 * lisp/progmodes/grep.el (zrgrep):
a0f71260f8 Minor copyedits in doc/emacs/text.texi
adfe2f580f Remove outdated comment in syntax.el
b80e15b6a6 Prevent Flyspell from changing unrelated words
e385599457 Avoid errors in flymake in builds --without-x
d691e30cb0 More improvements of the Emacs manual

8 files changed, 47 insertions, 47 deletions

diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index a9120194a49..fd9e97f2d5f 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -103,13 +103,14 @@ supports both of these forms, as well as any mixture of them---this
 is ``bidirectional text''.  @xref{Bidirectional Editing}.
 
 @item Bind
+@anchor{Glossary---Bind}
 To bind a key sequence means to give it a binding (q.v.).
 @xref{Rebinding}.
 
 @anchor{Glossary---Binding}
 @item Binding
 A key sequence gets its meaning in Emacs by having a binding, which is a
-command (q.v.), a Lisp function that is run when you type that
+command (q.v.)---a Lisp function that is run when you type that
 sequence.  @xref{Commands,Binding}.  Customization often involves
 rebinding a character to a different command function.  The bindings of
 all key sequences are recorded in the keymaps (q.v.).  @xref{Keymaps}.
@@ -141,8 +142,8 @@ are visiting (q.v.@:) some file.  @xref{Buffers}.
 
 @item Buffer Selection History
 Emacs keeps a buffer selection history that records how recently each
-Emacs buffer has been selected.  This is used for choosing a buffer to
-select.  @xref{Buffers}.
+Emacs buffer has been selected.  This is used for choosing which
+buffer to select.  @xref{Buffers}.
 
 @item Bug
 A bug is an incorrect or unreasonable behavior of a program, or
@@ -220,9 +221,9 @@ the clipboard is used @emph{instead} of the primary selection.
 @xref{Clipboard}.
 
 @item Coding System
-A coding system is an encoding for representing text characters in a
-file or in a stream of information.  Emacs has the ability to convert
-text to or from a variety of coding systems when reading or writing it.
+A coding system is a way to encode text characters in a file or in a
+stream of information.  Emacs has the ability to convert text to or
+from a variety of coding systems when reading or writing it.
 @xref{Coding Systems}.
 
 @item Command
@@ -263,12 +264,12 @@ executes faster.
 
 @item Complete Key
 A complete key is a key sequence that fully specifies one action to be
-performed by Emacs.  For example, @kbd{X} and @kbd{C-f} and @kbd{C-x m}
-are complete keys.  Complete keys derive their meanings from being bound
-(q.v.@:) to commands (q.v.).  Thus, @kbd{X} is conventionally bound to
-a command to insert @samp{X} in the buffer; @kbd{C-x m} is
-conventionally bound to a command to begin composing a mail message.
-@xref{Keys}.
+performed by Emacs.  For example, @kbd{X} and @kbd{C-f} and @kbd{C-x
+m} are complete keys.  Complete keys derive their meanings from being
+bound (@pxref{Glossary---Bind}) to commands (q.v.).  Thus, @kbd{X} is
+conventionally bound to a command to insert @samp{X} in the buffer;
+@kbd{C-x m} is conventionally bound to a command to begin composing a
+mail message.  @xref{Keys}.
 
 @item Completion
 Completion is what Emacs does when it automatically expands an
@@ -281,11 +282,11 @@ file names.  Completion usually occurs when @key{TAB}, @key{SPC} or
 @anchor{Glossary---Continuation Line}
 @item Continuation Line
 When a line of text is longer than the width of the window, it
-normally (but see @ref{Glossary---Truncation}) takes up more than one
-screen line when displayed.  We say that the text line is continued, and all
-screen lines used for it after the first are called continuation
-lines.  @xref{Continuation Lines}.  A related Emacs feature is
-filling (q.v.).
+normally takes up more than one screen line when displayed (but see
+@ref{Glossary---Truncation}).  We say that the text line is continued,
+and all screen lines used for it after the first are called
+continuation lines.  @xref{Continuation Lines}.  A related Emacs
+feature is filling (q.v.).
 
 @item Control Character
 A control character is a character that you type by holding down the
@@ -418,7 +419,7 @@ Variables}.
 On GNU and other Unix-like systems, directory names are strings that
 end in @samp{/}.  For example, @file{/no-such-dir/} is a directory
 name whereas @file{/tmp} is not, even though @file{/tmp} names a file
-that happens to be a directory.  On MS-DOS the relationship is more
+that happens to be a directory.  On MS-Windows the relationship is more
 complicated.  @xref{Directory Names,,, elisp, the Emacs Lisp Reference
 Manual}.
 
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index e1b8070f432..60986347a71 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2463,12 +2463,6 @@ sessions, or add this line in your init file (@pxref{Init File}):
 (desktop-save-mode 1)
 @end example
 
-@vindex desktop-auto-save-timeout
-@noindent
-When @code{desktop-save-mode} is active and the desktop file exists,
-Emacs auto-saves it every @code{desktop-auto-save-timeout}
-seconds, if that is non-@code{nil} and non-zero.
-
 @findex desktop-change-dir
 @findex desktop-revert
 @vindex desktop-path
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 74fae2a8bb5..be471099a57 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -77,7 +77,6 @@ mode for the C programming language is @code{c-mode}.
 @cindex VHDL mode
 @cindex M4 mode
 @cindex Shell-script mode
-@cindex Scheme mode
 @cindex OPascal mode
 @cindex PostScript mode
 @cindex Conf mode
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index e9371f39a96..cb62ce36526 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -802,7 +802,7 @@ its contents.
 @vindex rmail-enable-mime-composing
 @findex unforward-rmail-message
   Rmail offers two formats for forwarded messages.  The default is to
-use MIME (@pxref{Rmail Display}) format.  This includes the original
+use the MIME format (@pxref{Rmail Display}).  This includes the original
 message as a separate part.  You can use a simpler format if you
 prefer, by setting the variable @code{rmail-enable-mime-composing} to
 @code{nil}.  In this case, Rmail just includes the original message
@@ -1092,7 +1092,7 @@ Sort messages of current Rmail buffer by author's name.
 @findex rmail-sort-by-recipient
 @item C-c C-s C-r
 @itemx M-x rmail-sort-by-recipient
-Sort messages of current Rmail buffer by recipient's names.
+Sort messages of current Rmail buffer by recipient's name.
 
 @findex rmail-sort-by-correspondent
 @item C-c C-s C-c
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 9ecc41e8880..8137945601b 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1461,8 +1461,9 @@ etc.
 export and publication.  To export the current buffer, type @kbd{C-c
 C-e} (@code{org-export}) anywhere in an Org buffer.  This command
 prompts for an export format; currently supported formats include
-HTML, @LaTeX{}, OpenDocument (@file{.odt}), and PDF@.  Some formats,
-such as PDF, require certain system tools to be installed.
+HTML, @LaTeX{}, Texinfo, OpenDocument (@file{.odt}), iCalendar,
+Markdown, man-page, and PDF@.  Some formats, such as PDF, require
+certain system tools to be installed.
 
 @vindex org-publish-project-alist
   To export several files at once to a specific directory, either
@@ -1521,14 +1522,14 @@ with @LaTeX{}.}.
   Emacs provides a @TeX{} major mode for each of these variants: Plain
 @TeX{} mode, @LaTeX{} mode, Doc@TeX{} mode, and Sli@TeX{} mode.  Emacs
 selects the appropriate mode by looking at the contents of the buffer.
-(This is done by the @code{tex-mode} command, which is normally called
-automatically when you visit a @TeX{}-like file.  @xref{Choosing
-Modes}.)  If the contents are insufficient to determine this, Emacs
-chooses the mode specified by the variable @code{tex-default-mode};
-its default value is @code{latex-mode}.  If Emacs does not guess
-right, you can select the correct variant of @TeX{} mode using the
-command @kbd{M-x plain-tex-mode}, @kbd{M-x latex-mode}, @kbd{M-x
-slitex-mode}, or @kbd{doctex-mode}.
+(This is done by invoking the @code{tex-mode} command, which is
+normally called automatically when you visit a @TeX{}-like file.
+@xref{Choosing Modes}.)  If the contents are insufficient to determine
+this, Emacs chooses the mode specified by the variable
+@code{tex-default-mode}; its default value is @code{latex-mode}.  If
+Emacs does not guess right, you can select the correct variant of
+@TeX{} mode using the commands @code{plain-tex-mode},
+@code{latex-mode}, @code{slitex-mode}, or @code{doctex-mode}.
 
   The following sections document the features of @TeX{} mode and its
 variants.  There are several other @TeX{}-related Emacs packages,
@@ -1701,14 +1702,16 @@ chapter of a larger document).
 @table @kbd
 @item C-c C-b
 Invoke @TeX{} on the entire current buffer (@code{tex-buffer}).
+
 @item C-c C-r
 Invoke @TeX{} on the current region, together with the buffer's header
 (@code{tex-region}).
+
 @item C-c C-f
 Invoke @TeX{} on the current file (@code{tex-file}).
 
 @item C-c C-v
-Preview the output from the last @kbd{C-c C-r}, @kbd{C-c C-b}, or @kbd{C-c
+Preview the output from the last @kbd{C-c C-b}, @kbd{C-c C-r}, or @kbd{C-c
 C-f} command (@code{tex-view}).
 
 @item C-c C-p
@@ -1743,7 +1746,7 @@ C-p} (@code{tex-print}) to print a hardcopy of the output file.
 @cindex @env{TEXINPUTS} environment variable
 @vindex tex-directory
   By default, @kbd{C-c C-b} runs @TeX{} in the current directory.  The
-output of @TeX{} also goes in this directory.  To run @TeX{} in a
+output of @TeX{} is also created in this directory.  To run @TeX{} in a
 different directory, change the variable @code{tex-directory} to
 the desired directory.  If your environment variable @env{TEXINPUTS}
 contains relative names, or if your files contain
@@ -1889,14 +1892,16 @@ keys (@pxref{Completion}).
 
 @vindex tex-shell-hook
 @vindex tex-mode-hook
+@vindex doctex-mode-hook
 @vindex latex-mode-hook
 @vindex slitex-mode-hook
 @vindex plain-tex-mode-hook
   Entering any variant of @TeX{} mode runs the hooks
 @code{text-mode-hook} and @code{tex-mode-hook}.  Then it runs either
-@code{plain-tex-mode-hook}, @code{latex-mode-hook}, or
-@code{slitex-mode-hook}, whichever is appropriate.  Starting the
-@TeX{} shell runs the hook @code{tex-shell-hook}.  @xref{Hooks}.
+@code{plain-tex-mode-hook}, @code{doctex-mode-hook},
+@code{latex-mode-hook}, or @code{slitex-mode-hook}, whichever is
+appropriate.  Starting the @TeX{} shell runs the hook
+@code{tex-shell-hook}.  @xref{Hooks}.
 
 @findex iso-iso2tex
 @findex iso-tex2iso
@@ -2002,7 +2007,8 @@ characters themselves (@code{sgml-name-8bit-mode}).
 @kindex C-c C-v @r{(SGML mode)}
 @findex sgml-validate
 Run a shell command (which you must specify) to validate the current
-buffer as SGML (@code{sgml-validate}).
+buffer as SGML (@code{sgml-validate}).  (In HTML mode this key
+sequence runs a different command.)
 
 @item C-c @key{TAB}
 @kindex C-c TAB @r{(SGML mode)}
@@ -2913,7 +2919,7 @@ right-hand buffer.)
 @kindex F2 RET
 @kindex C-x 6 RET
 @findex 2C-newline
-  The command @kbd{C-x 6 @key{RET}} or @kbd{@key{F2} @key{RET}}
+  The command @kbd{@key{F2} @key{RET}} or @kbd{C-x 6 @key{RET}}
 (@code{2C-newline}) inserts a newline in each of the two buffers at
 corresponding positions.  This is the easiest way to add a new line to
 the two-column text while editing it in split buffers.
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index d0d39d44e95..5a229c1cd6f 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -4734,7 +4734,7 @@ Once again, line 8 is assigned as @code{brace-entry-open} as is line
 with anchor point at the @samp{@{} of line 8@footnote{This extra
 syntactic element was introduced in @ccmode{} 5.33.1 to allow extra
 flexibility in indenting the second line of such a construct.  You can
-preserve the behaviour resulting from the former syntactic analysis by
+preserve the behavior resulting from the former syntactic analysis by
 giving @code{brace-list-entry} an offset of
 @code{c-lineup-under-anchor} (@pxref{Misc Line-Up}).}, and
 @code{brace-list-entry} anchored on the @samp{1} of line 8.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 4434636b7f2..c727cc3f8db 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -10235,7 +10235,7 @@ for display purposes only.
 @cindex dash, special symbol
 @cindex ellipsis, special symbol
 In addition to regular entities defined above, Org exports in a special
-way@footnote{This behaviour can be disabled with @code{-} export setting
+way@footnote{This behavior can be disabled with @code{-} export setting
 (@pxref{Export settings}).} the following commonly used character
 combinations: @samp{\-} is treated as a shy hyphen, @samp{--} and @samp{---}
 are converted into dashes, and @samp{...} becomes a compact set of dots.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index f2530cd6eaa..e1c4f3e980e 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3563,7 +3563,7 @@ Why is @file{~/.sh_history} file on the remote host growing?
 @vindex tramp-histfile-override
 Due to the remote shell saving tilde expansions triggered by
 @value{tramp}, the history file is probably growing rapidly.
-@value{tramp} can suppress this behaviour with the user option
+@value{tramp} can suppress this behavior with the user option
 @option{tramp-histfile-override}.  When set to @code{t}, environment
 variable @env{HISTFILE} is unset, and environment variables
 @env{HISTFILESIZE} @env{HISTSIZE} are set to 0.