[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/exwm 1e36a22 13/64: Check buffer mode in exwm-reset
From: |
Chris Feng |
Subject: |
[elpa] externals/exwm 1e36a22 13/64: Check buffer mode in exwm-reset |
Date: |
Thu, 17 Sep 2015 23:17:54 +0000 |
branch: externals/exwm
commit 1e36a22b3f5fd3867f29eaf3e1891422a3bb952c
Author: Chris Feng <address@hidden>
Commit: Chris Feng <address@hidden>
Check buffer mode in exwm-reset
This should prevent users from misoperation.
---
exwm-workspace.el | 6 +-----
exwm.el | 7 ++++---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/exwm-workspace.el b/exwm-workspace.el
index ed06f64..d700f41 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -111,11 +111,7 @@ The optional FORCE option is for internal use only."
(unless (and (<= 0 index) (< index exwm-workspace-number))
(user-error "[EXWM] Workspace index out of range: %d" index))
(when (or force (/= exwm-workspace-current-index index))
- ;; Exit fullscreen mode
- (with-current-buffer (window-buffer)
- (when (and (eq major-mode 'exwm-mode) exwm--fullscreen)
- (exwm-layout-unset-fullscreen)
- (exwm-input-grab-keyboard)))
+ (exwm-reset) ;exit full screen
(let ((frame (elt exwm-workspace--list index)))
(setq exwm-workspace--current frame
exwm-workspace-current-index index)
diff --git a/exwm.el b/exwm.el
index c8f10af..18d8dda 100644
--- a/exwm.el
+++ b/exwm.el
@@ -195,9 +195,10 @@
(defun exwm-reset ()
"Reset window to standard state: non-fullscreen, line-mode."
(interactive)
- (with-current-buffer (window-buffer (selected-window))
- (when exwm--fullscreen (exwm-layout-unset-fullscreen))
- (exwm-input-grab-keyboard)))
+ (with-current-buffer (window-buffer)
+ (when (and (eq major-mode 'exwm-mode) exwm--fullscreen)
+ (exwm-layout-unset-fullscreen)
+ (exwm-input-grab-keyboard))))
(defmacro exwm--with-current-id (id &rest body)
"Evaluate BODY in the context of the buffer corresponding to window ID."
- [elpa] externals/exwm 968d0b4 04/64: Various fixes for workspace, (continued)
- [elpa] externals/exwm 968d0b4 04/64: Various fixes for workspace, Chris Feng, 2015/09/17
- [elpa] externals/exwm 36e8361 05/64: Various fixes, Chris Feng, 2015/09/17
- [elpa] externals/exwm f4416a1 06/64: Fix potential naming conflicts, Chris Feng, 2015/09/17
- [elpa] externals/exwm ea7c6c7 08/64: Fix typos, Chris Feng, 2015/09/17
- [elpa] externals/exwm 7892ed3 02/64: Improve move/resize, Chris Feng, 2015/09/17
- [elpa] externals/exwm ee3ce55 09/64: Merge pull request #2 from KAMiKAZOW/patch-1, Chris Feng, 2015/09/17
- [elpa] externals/exwm caf2fee 11/64: Drop intro to EXIM, Chris Feng, 2015/09/17
- [elpa] externals/exwm 3fc0cb2 10/64: Various fixes, Chris Feng, 2015/09/17
- [elpa] externals/exwm 3fb90b9 12/64: Fix fullscreen issues, Chris Feng, 2015/09/17
- [elpa] externals/exwm 86764d2 07/64: Add basic RandR support, Chris Feng, 2015/09/17
- [elpa] externals/exwm 1e36a22 13/64: Check buffer mode in exwm-reset,
Chris Feng <=
- [elpa] externals/exwm 14628a9 16/64: Fix race conditions when managing a window, Chris Feng, 2015/09/17
- [elpa] externals/exwm 5298489 18/64: Fix some input focus issues, Chris Feng, 2015/09/17
- [elpa] externals/exwm 3b9d0dd 17/64: Fixes for manage/unmanage window, Chris Feng, 2015/09/17
- [elpa] externals/exwm 42f4ec6 20/64: Show moved window by default, Chris Feng, 2015/09/17
- [elpa] externals/exwm 36bb579 21/64: Refresh when minibuffer grows (fix #10), Chris Feng, 2015/09/17
- [elpa] externals/exwm 2ad1a89 14/64: Various input fixes, Chris Feng, 2015/09/17
- [elpa] externals/exwm 84f0f03 15/64: Fix input focus lost after closing window, Chris Feng, 2015/09/17
- [elpa] externals/exwm 63402b0 19/64: Correct layout refresh problems, Chris Feng, 2015/09/17
- [elpa] externals/exwm edc70eb 22/64: Remove redundant code caused by the concurrency of events, Chris Feng, 2015/09/17
- [elpa] externals/exwm 2d4104a 23/64: Fix emacsclient bugs, Chris Feng, 2015/09/17