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

diff --cc ChangeLog.2
Simple merge

diff --cc doc/emacs/programs.texi
Simple merge

diff --cc doc/emacs/text.texi
Simple merge

diff --cc doc/misc/org.texi
Simple merge

diff --cc doc/misc/tramp.texi
Simple merge

diff --cc lisp/filenotify.el
Simple merge

diff --cc lisp/frame.el
index 0ed7d6a64f1c236031dd095adb4f950c06c3f907,447413b325612e6fa0328f804f29c12ade31d0ff..0cf502d506623b4010d2b69d80dc28ce1b699d9b
--- 1/lisp/frame.el
--- 2/lisp/frame.el
+++ b/lisp/frame.el
@@@ -2429,19 -2431,18 +2429,19 @@@ transitions from one fullscreen state t
  
  See also `toggle-frame-maximized'."
    (interactive)
 -  (let ((fullscreen (frame-parameter nil 'fullscreen)))
 +  (let ((fullscreen (frame-parameter frame 'fullscreen)))
      (if (memq fullscreen '(fullscreen fullboth))
 -      (let ((fullscreen-restore (frame-parameter nil 'fullscreen-restore)))
 +      (let ((fullscreen-restore (frame-parameter frame 'fullscreen-restore)))
          (if (memq fullscreen-restore '(maximized fullheight fullwidth))
 -            (set-frame-parameter nil 'fullscreen fullscreen-restore)
 -          (set-frame-parameter nil 'fullscreen nil)))
 +            (set-frame-parameter frame 'fullscreen fullscreen-restore)
 +          (set-frame-parameter frame 'fullscreen nil)))
        (modify-frame-parameters
 -       nil `((fullscreen . fullboth) (fullscreen-restore . ,fullscreen))))
 +       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))))
 +
  \f
  ;;;; Key bindings
  

diff --cc lisp/org/org-element.el
Simple merge

diff --cc lisp/org/org.el
Simple merge

diff --cc lisp/progmodes/flymake.el
Simple merge

diff --cc lisp/progmodes/grep.el
Simple merge

diff --cc lisp/term.el
Simple merge