[Emacs-diffs] /srv/bzr/emacs/trunk r111634: * lisp/frame.el (toggle-frame-maximized, toggle-frame-fullscreen):

[Juri Linkov]

------------------------------------------------------------
revno: 111634
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-01-31 01:50:11 +0200
message:
  * 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>.
modified:
  lisp/ChangeLog
  lisp/frame.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-30 20:46:10 +0000
+++ b/lisp/ChangeLog    2013-01-30 23:50:11 +0000
@@ -1,3 +1,9 @@
+2013-01-30  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/make-mode.el (makefile-backslash-region): Don't compute

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2013-01-21 10:45:20 +0000
+++ b/lisp/frame.el     2013-01-30 23:50:11 +0000
@@ -1666,7 +1666,7 @@
 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 @@
   (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)))))