From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 5 Mar 2018 01:16:39 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5556
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8;p=emacs.git

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
---

bd6c1976fba03bd2e4ca0a52cea562c8ecf23ef8
diff --cc lisp/frame.el
index 0ed7d6a64f1,447413b3256..0cf502d5066
--- a/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))))
 +
  
  ;;;; Key bindings