[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master bd6c197 2/2: Merge from origin/emacs-26
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] master bd6c197 2/2: Merge from origin/emacs-26 |
|
Date: |
Sun, 4 Mar 2018 20:17:51 -0500 (EST) |
branch: master
commit bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8
Merge: 7858952 f2caf08
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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
---
ChangeLog.2 | 2 +-
ChangeLog.3 | 18 +++++++++---------
doc/emacs/glossary.texi | 37 +++++++++++++++++++------------------
doc/emacs/misc.texi | 6 ------
doc/emacs/programs.texi | 1 -
doc/emacs/rmail.texi | 4 ++--
doc/emacs/text.texi | 40 +++++++++++++++++++++++-----------------
doc/misc/cc-mode.texi | 2 +-
doc/misc/org.texi | 2 +-
doc/misc/tramp.texi | 2 +-
etc/ORG-NEWS | 12 ++++++------
lisp/emacs-lisp/syntax.el | 6 ------
lisp/filenotify.el | 2 +-
lisp/frame.el | 2 +-
lisp/org/org-element.el | 2 +-
lisp/org/org.el | 4 ++--
lisp/progmodes/flymake.el | 4 ++++
lisp/progmodes/grep.el | 2 ++
lisp/term.el | 4 ++--
lisp/textmodes/flyspell.el | 4 ++++
20 files changed, 80 insertions(+), 76 deletions(-)
diff --git a/ChangeLog.2 b/ChangeLog.2
index b17cc3c..71c792e 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -9949,7 +9949,7 @@
* lisp/files-x.el (modify-dir-local-variable): Small rewrite
Change a variable name to be more meaningful, and reorder some of
- the code with no change in behaviour.
+ the code with no change in behavior.
2016-01-26 Artur Malabarba <address@hidden>
diff --git a/ChangeLog.3 b/ChangeLog.3
index 5b68559..ea4d71c 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -4805,7 +4805,7 @@
2017-10-11 Alan Third <address@hidden>
- Make frame-list-z-order on NS match Windows behaviour (bug#28788)
+ Make frame-list-z-order on NS match Windows behavior (bug#28788)
* src/nsfns.m (Fns_frame_list_z_order): If terminal isn't a frame,
ignore it rather than returning nil.
@@ -5932,7 +5932,7 @@
Flymake uses some new fringe bitmaps
- Also fix behaviour whereby flymake wouldn't react to a change in the
+ Also fix behavior whereby flymake wouldn't react to a change in the
variable.
* lisp/progmodes/flymake-ui.el (flymake-error-bitmap)
@@ -6180,7 +6180,7 @@
REPORT-FN's calling convention stipulates that a backend calls it with
a list of diagnostics as argument, or, alternatively, with a symbol
denoting an exceptional situation, usually some panic resulting from a
- misconfigured backend. In keeping with legacy behaviour,
+ misconfigured backend. In keeping with legacy behavior,
flymake.el's response to a panic is to disable the issuing backend.
The flymake--diag object representing a diagnostic now also keeps
@@ -7918,7 +7918,7 @@
2017-09-15 Michael Albinus <address@hidden>
- Improve Tramp behaviour according to bug#27986
+ Improve Tramp behavior according to bug#27986
* lisp/net/tramp-adb.el (tramp-adb-handle-copy-file):
* lisp/net/tramp-sh.el (tramp-sh-handle-copy-directory):
@@ -8120,7 +8120,7 @@
Add clarification to if-let* docstring
- Also make its behaviour consistent with and-let* in that empty bindings
+ Also make its behavior consistent with and-let* in that empty bindings
results in success, not failure.
* lisp/emacs-lisp/subr-x.el: Edit docstring, change else to then.
@@ -22797,7 +22797,7 @@
(Type Descriptors): new section.
* doc/lispref/elisp.texi: reference it.
* doc/lispref/records.texi (Records): reference it. Document
- behaviour when type slot is a record.
+ behavior when type slot is a record.
* admin/alloc-colors.c (Fmake_record, Frecord): mention type desciptors.
@@ -23348,7 +23348,7 @@
Now dired-mark-extension prepends '.' to extension when not present.
Add command dired-mark-suffix to preserve the previous
- behaviour (Bug#25942).
+ behavior (Bug#25942).
* lisp/dired-x.el (dired-mark-suffix): New command;
mark files ending in a given suffix.
(dired--mark-suffix-interactive-spec): New defun.
@@ -45072,7 +45072,7 @@
Sync from gnulib
This incorporates a spelling fix, plus:
- 2016-05-09 Fix undefined behaviour in gettext.h
+ 2016-05-09 Fix undefined behavior in gettext.h
* lib/gettext.h, lib/mktime.c:
Copy from gnulib.
@@ -54900,7 +54900,7 @@
make check unconditional, check-maybe top-level.
* Makefile.in: Add check-maybe target.
- * test/Makefile.in: Restore unconditional behaviour to make check.
+ * test/Makefile.in: Restore unconditional behavior to make check.
2015-12-01 Phillip Lord <address@hidden>
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index a912019..fd9e97f 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
address@hidden
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.
address@hidden
+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;
address@hidden 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
address@hidden). 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 e1b8070..6098634 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
address@hidden desktop-auto-save-timeout
address@hidden
-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 address@hidden 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 74fae2a..be47109 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
address@hidden Scheme mode
@cindex OPascal mode
@cindex PostScript mode
@cindex Conf mode
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index e9371f3..cb62ce3 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 9ecc41e..8137945 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 address@hidden Some formats,
-such as PDF, require certain system tools to be installed.
+HTML, @LaTeX{}, Texinfo, OpenDocument (@file{.odt}), iCalendar,
+Markdown, man-page, and address@hidden 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, address@hidden mode, and address@hidden 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.
address@hidden Modes}.) If the contents are insufficient to determine
+this, Emacs chooses the mode specified by the variable
address@hidden; its default value is @code{latex-mode}. If
+Emacs does not guess right, you can select the correct variant of
address@hidden mode using the commands @code{plain-tex-mode},
address@hidden, @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
address@hidden 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
address@hidden, @code{latex-mode-hook}, or
address@hidden, whichever is appropriate. Starting the
address@hidden shell runs the hook @code{tex-shell-hook}. @xref{Hooks}.
address@hidden, @code{doctex-mode-hook},
address@hidden, or @code{slitex-mode-hook}, whichever is
+appropriate. Starting the @TeX{} shell runs the hook
address@hidden @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 @address@hidden @key{RET}}
+ The command @address@hidden @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 d0d39d4..5a229c1 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 @address@hidden of line address@hidden 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 4434636..c727cc3 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
address@hidden behaviour can be disabled with @code{-} export setting
address@hidden 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 f2530cd..e1c4f3e 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.
address@hidden can suppress this behaviour with the user option
address@hidden 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.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 12eab44..b9f3b0c 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1358,7 +1358,7 @@ don't have to be distinct on a heading.
Grouptags had to previously be defined with { }. This syntax is
already used for exclusive tags and Grouptags need their own,
-non-exclusive syntax. This behaviour is achieved with [ ]. Note: { }
+non-exclusive syntax. This behavior is achieved with [ ]. Note: { }
can still be used also for Grouptags but then only one of the given
tags can be used on the headline at the same time. Example:
@@ -1422,9 +1422,9 @@ Check the documentation for more details.
Thanks to Jarmo Hurri for this feature.
-*** New behaviour for ~org-toggle-latex-fragment~
+*** New behavior for ~org-toggle-latex-fragment~
-The new behaviour is the following:
+The new behavior is the following:
- With a double prefix argument or with a single prefix argument when
point is before the first headline, toggle overlays in the whole
@@ -1623,10 +1623,10 @@ leading spaces within table cells.
Org uses the MathJax CDN by default. See the manual and the docstring
of ~org-html-mathjax-options~ for details.
-*** New behaviour in `org-export-options-alist'
+*** New behavior in `org-export-options-alist'
When defining a back-end, it is now possible to specify to give
-`parse' behaviour on a keyword. It is equivalent to call
+`parse' behavior on a keyword. It is equivalent to call
`org-element-parse-secondary-string' on the value.
However, parsed =KEYWORD= is automatically associated to an
@@ -1745,7 +1745,7 @@ everywhere in the buffer, possibly corrupting URLs.
*** Removed option =org-babel-sh-command=
This undocumented option defaulted to the value of =shell-file-name= at
-the time of loading =ob-shell=. The new behaviour is to use the value
+the time of loading =ob-shell=. The new behavior is to use the value
of =shell-file-name= directly when the shell langage is =shell=. To chose
a different shell, either customize =shell-file-name= or bind this
variable locally.
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 6106720..ad1a966 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -363,12 +363,6 @@ An \"outermost position\" means one that it is outside of
any syntactic entity:
outside of any parentheses, comments, or strings encountered in the scan.
If no such position is recorded in PPSS (because the end of the scan was
itself at the outermost level), return nil."
- ;; BEWARE! We rely on the undocumented 9th field. The 9th field currently
- ;; contains the list of positions of the enclosing open-parens.
- ;; I.e. those positions are outside of any string/comment and the first of
- ;; those is outside of any paren (i.e. corresponds to a nil ppss).
- ;; If this list is empty but we are in a string or comment, then the 8th
- ;; field contains a similar "toplevel" position.
(or (car (nth 9 ppss))
(nth 8 ppss)))
diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index 5d37f39..59a8c0e 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -423,7 +423,7 @@ DESCRIPTOR should be an object returned by
`file-notify-add-watch'."
;; TODO:
;; * Watching a /dir/file may receive events for dir.
-;; (This may be the desired behaviour.)
+;; (This may be the desired behavior.)
;; * Watching a file in an already watched directory
;; If the file is created and *then* a watch is added to that file, the
;; watch might receive events which occurred prior to it being created,
diff --git a/lisp/frame.el b/lisp/frame.el
index 0ed7d6a..0cf502d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2439,7 +2439,7 @@ See also `toggle-frame-maximized'."
frame `((fullscreen . fullboth) (fullscreen-restore . ,fullscreen))))
;; Manipulating a frame without waiting for the fullscreen
;; animation to complete can cause a crash, or other unexpected
- ;; behaviour, on macOS (bug#28496).
+ ;; behavior, on macOS (bug#28496).
(when (featurep 'cocoa) (sleep-for 0.5))))
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 844349c..a63aae5 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -4721,7 +4721,7 @@ indentation removed from its contents."
;; Cache is enabled by default, but can be disabled globally with
;; `org-element-use-cache'. `org-element-cache-sync-idle-time',
;; org-element-cache-sync-duration' and `org-element-cache-sync-break'
-;; can be tweaked to control caching behaviour.
+;; can be tweaked to control caching behavior.
;;
;; Internally, parsed elements are stored in an AVL tree,
;; `org-element--cache'. This tree is updated lazily: whenever
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 2f60a07..3ec6b4e 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -10641,7 +10641,7 @@ a timestamp or a link."
(save-excursion
;; Do not validate action when point is on the
;; spaces right after the footnote label, in
- ;; order to be on par with behaviour on links.
+ ;; order to be on par with behavior on links.
(skip-chars-forward " \t")
(let ((begin
(org-element-property :contents-begin context)))
@@ -10794,7 +10794,7 @@ there is one, return it."
(cons link end)))))
;; TODO: These functions are deprecated since `org-open-at-point'
-;; hard-codes behaviour for "file+emacs" and "file+sys" types.
+;; hard-codes behavior for "file+emacs" and "file+sys" types.
(defun org-open-file-with-system (path)
"Open file at PATH using the system way of opening it."
(org-open-file path 'system))
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index a47f13f..56f43e4 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -48,6 +48,10 @@
(require 'thingatpt) ; end-of-thing
(require 'warnings) ; warning-numeric-level, display-warning
(require 'compile) ; for some faces
+;; We need the next require to avoid compiler warnings and run-time
+;; errors about mouse-wheel-up/down-event in builds --without-x, where
+;; mwheel is not preloaded.
+(require 'mwheel)
;; when-let*, if-let*, hash-table-keys, hash-table-values:
(eval-when-compile (require 'subr-x))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 9b2c6f1..dc74ad2 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1230,6 +1230,8 @@ file name to `*.gz', and sets `grep-highlight-matches' to
`always'."
(grep-find-template nil)
(grep-find-command nil)
(grep-host-defaults-alist nil)
+ ;; `zgrep' doesn't support the `--null' option.
+ (grep-use-null-filename-separator nil)
;; Use for `grep-read-files'
(grep-files-aliases '(("all" . "* .*")
("gz" . "*.gz"))))
diff --git a/lisp/term.el b/lisp/term.el
index a0313d8..cf7699a 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -487,7 +487,7 @@ inconsistent with the state of the terminal understood by
the
inferior process. Only the process filter is allowed to make
changes to the buffer.
-Customize this option to nil if you want the previous behaviour."
+Customize this option to nil if you want the previous behavior."
:version "26.1"
:type 'boolean
:group 'term)
@@ -508,7 +508,7 @@ commands can be invoked on the mouse-selected point or
region,
until the process filter (or user) moves point to the process
mark once again.
-Customize this option to nil if you want the previous behaviour."
+Customize this option to nil if you want the previous behavior."
:version "26.1"
:type 'boolean
:group 'term)
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index d87cb5e..e462669 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1944,6 +1944,10 @@ spell-check."
(call-interactively flyspell--prev-meta-tab-binding)
(let ((pos (point))
(old-max (point-max)))
+ ;; Flush a possibly stale cache from previous invocations of
+ ;; flyspell-auto-correct-word.
+ (if (not (eq last-command 'flyspell-auto-correct-word))
+ (setq flyspell-auto-correct-region nil))
;; Use the correct dictionary.
(flyspell-accept-buffer-local-defs)
(if (and (eq flyspell-auto-correct-pos pos)