diff options
| author | Alan Third | 2017-10-01 00:06:23 +0100 |
|---|---|---|
| committer | Alan Third | 2017-10-07 21:57:16 +0100 |
| commit | 6dfc778d54ceb02b135d45300a201ec79edf1af2 (patch) | |
| tree | 558435f8049dce6e8c69f30a184f84d9bc082ecc /lisp | |
| parent | 3db0dc21689ae7dbdc697bb5fe45e988cee1f831 (diff) | |
| download | emacs-6dfc778d54ceb02b135d45300a201ec79edf1af2.tar.gz emacs-6dfc778d54ceb02b135d45300a201ec79edf1af2.zip | |
Fix fullscreen crash on macOS (bug#28496)
* lisp/frame.el (toggle-frame-fullscreen): Wait for animation to
complete on macOS.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index e501daefb4c..7b57aa3df1f 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -2434,7 +2434,11 @@ See also `toggle-frame-maximized'." | |||
| 2434 | (set-frame-parameter nil 'fullscreen fullscreen-restore) | 2434 | (set-frame-parameter nil 'fullscreen fullscreen-restore) |
| 2435 | (set-frame-parameter nil 'fullscreen nil))) | 2435 | (set-frame-parameter nil 'fullscreen nil))) |
| 2436 | (modify-frame-parameters | 2436 | (modify-frame-parameters |
| 2437 | nil `((fullscreen . fullboth) (fullscreen-restore . ,fullscreen)))))) | 2437 | nil `((fullscreen . fullboth) (fullscreen-restore . ,fullscreen)))) |
| 2438 | ;; Manipulating a frame without waiting for the fullscreen | ||
| 2439 | ;; animation to complete can cause a crash, or other unexpected | ||
| 2440 | ;; behaviour, on macOS (bug#28496). | ||
| 2441 | (when (featurep 'cocoa) (sit-for 1)))) | ||
| 2438 | 2442 | ||
| 2439 | ;;;; Key bindings | 2443 | ;;;; Key bindings |
| 2440 | 2444 | ||