From 64ced394377394b764957bbb32b160726c9083b5 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 31 Jan 2013 01:50:11 +0200 Subject: [PATCH] =?utf8?q?*=20lisp/frame.el=20(toggle-frame-maximized,=20t?= =?utf8?q?oggle-frame-fullscreen):=20Use=20fullboth=20as=20an=20alias=20fo?= =?utf8?q?r=20fullscreen.=20=20Suggested=20by=20Jan=20Dj=C3=A4rv=20in=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lisp/ChangeLog | 6 ++++++ lisp/frame.el | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) 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))))) -- 2.39.2