summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 2c17b781caa..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)))))