* lisp/frame.el (toggle-frame-maximized, toggle-frame-fullscreen):

Use fullboth as an alias for fullscreen.  Suggested by Jan Djärv in
<http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00203.html>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e222e17ed074abc965bbf2fb793cb9800eae76d9..5c8237ee4aa0b18803eb50af454d658cf0804eef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-30  Juri Linkov  <juri@jurta.org>
+
+       * frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
+       Use fullboth as an alias for fullscreen.  Suggested by Jan Djärv in
+       <http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00203.html>.
+
 2013-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/make-mode.el (makefile-backslash-region): Don't compute

diff --git a/lisp/frame.el b/lisp/frame.el
index 2c17b781caaf90dadcd284d9c61f9cd6d91345a3..4bf885b27b26957049ed3cd00391e5be240c8b04 100644 (file)
--- 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)))))