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

9 files changed, 17 insertions, 13 deletions

diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 6106720f7a5..ad1a9665ff0 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 5d37f39a70b..59a8c0e88aa 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 0ed7d6a64f1..0cf502d5066 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 844349c2fc0..a63aae5329d 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 2f60a075055..3ec6b4eabe3 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 a47f13fea35..56f43e4bb36 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 9b2c6f112c6..dc74ad2de5f 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 a0313d88dac..cf7699abc94 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 d87cb5e72ed..e4626696262 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)