From: Juri Linkov Date: Wed, 30 Jan 2013 23:50:11 +0000 (+0200) Subject: * lisp/frame.el (toggle-frame-maximized, toggle-frame-fullscreen): X-Git-Tag: emacs-24.3.90~173^2~7^2~189 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64ced394377394b764957bbb32b160726c9083b5;p=emacs.git * lisp/frame.el (toggle-frame-maximized, toggle-frame-fullscreen): Use fullboth as an alias for fullscreen. Suggested by Jan Djärv in . --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e222e17ed07..5c8237ee4aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-01-30 Juri Linkov + + * frame.el (toggle-frame-maximized, toggle-frame-fullscreen): + Use fullboth as an alias for fullscreen. Suggested by Jan Djärv in + . + 2013-01-30 Stefan Monnier * progmodes/make-mode.el (makefile-backslash-region): Don't compute 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)))))