diff options
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 243f524c403..4bf885b27b2 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1666,7 +1666,7 @@ so the frame will go to the right maximization state after disabling fullscreen mode. See also `toggle-frame-fullscreen'." (interactive) - (if (eq (frame-parameter nil 'fullscreen) 'fullscreen) + (if (memq (frame-parameter nil 'fullscreen) '(fullscreen fullboth)) (modify-frame-parameters nil `((maximized @@ -1690,10 +1690,10 @@ See also `toggle-frame-maximized'." (modify-frame-parameters nil `((maximized - . ,(unless (eq (frame-parameter nil 'fullscreen) 'fullscreen) + . ,(unless (memq (frame-parameter nil 'fullscreen) '(fullscreen fullboth)) (frame-parameter nil 'fullscreen))) (fullscreen - . ,(if (eq (frame-parameter nil 'fullscreen) 'fullscreen) + . ,(if (memq (frame-parameter nil 'fullscreen) '(fullscreen fullboth)) (if (eq (frame-parameter nil 'maximized) 'maximized) 'maximized) 'fullscreen))))) @@ -1707,6 +1707,7 @@ See also `toggle-frame-maximized'." (define-key ctl-x-5-map "o" 'other-frame) (define-key global-map [f11] 'toggle-frame-fullscreen) (define-key global-map [(meta f10)] 'toggle-frame-maximized) +(define-key esc-map [f10] 'toggle-frame-maximized) ;; Misc. |