[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/exwm 4287d31 3/3: Merge branch 'vedvyas/workspace-move-

From: Chris Feng
Subject: [elpa] externals/exwm 4287d31 3/3: Merge branch 'vedvyas/workspace-move-window-tweak' into externals/exwm
Date: Wed, 31 Aug 2016 11:28:19 +0000 (UTC)

branch: externals/exwm
commit 4287d31df1762af8cd6641f4f58fea6ed607d294
Merge: cfcaed6 b4517fb
Author: Chris Feng <address@hidden>
Commit: Chris Feng <address@hidden>

    Merge branch 'vedvyas/workspace-move-window-tweak' into externals/exwm
 exwm-floating.el  |    5 +++--
 exwm-workspace.el |    7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/exwm-floating.el b/exwm-floating.el
index 6f6cfec..f2cc09b 100644
--- a/exwm-floating.el
+++ b/exwm-floating.el
@@ -82,8 +82,9 @@ context of the corresponding buffer.")
 (defun exwm-floating--set-floating (id)
   "Make window ID floating."
   (let ((window (get-buffer-window (exwm--id->buffer id))))
-    (when window                        ;window in non-floating state
-      (set-window-buffer window (other-buffer)))) ;hide it first
+    (when window
+      ;; Hide the non-floating X window first.
+      (set-window-buffer window (other-buffer nil t))))
   (let* ((original-frame exwm-workspace--current)
          ;; Create new frame
          (frame (with-current-buffer
diff --git a/exwm-workspace.el b/exwm-workspace.el
index 9585112..24a59f9 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -746,10 +746,9 @@ INDEX must not exceed the current number of workspaces."
           ;; Move the X window container.
-          (if (eq frame exwm-workspace--current)
-              (set-window-buffer (get-buffer-window (current-buffer) t)
-                                 (other-buffer))
-            (bury-buffer)
+          (set-window-buffer (get-buffer-window (current-buffer) t)
+                             (other-buffer nil t))
+          (unless (eq frame exwm-workspace--current)
             ;; Clear the 'exwm-selected-window' frame parameter.
             (set-frame-parameter frame 'exwm-selected-window nil))
           (exwm-layout--hide id)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]