Mirrors/exwm
2
0
Fork 0
mirror of https://github.com/ch11ng/exwm.git synced 2025-04-13 22:54:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 093aea8e9c into 2babc8d070

Browse source
This commit is contained in:
Felix Lange 2017-05-08 23:07:50 +00:00 • committed by GitHub
commit 29394bcdbc
1 changed files with 17 additions and 17 deletions

34
exwm-workspace.el
View file

@ -781,10 +781,10 @@ INDEX must not exceed the current number of workspaces."
;;;###autoload
(defun exwm-workspace-switch-to-buffer (buffer-or-name)
"Make the current Emacs window display another buffer."
"Switch to a workspace displaying the given buffer."
(interactive
(let ((inhibit-quit t))
;; Show all buffers
;; Show all buffers temporarily.
(unless exwm-workspace-show-all-buffers
(dolist (pair exwm--id-buffer-alist)
(with-current-buffer (cdr pair)
@ -796,7 +796,7 @@ INDEX must not exceed the current number of workspaces."
(prog1
(with-local-quit
(list (get-buffer (read-buffer-to-switch "Switch to buffer: "))))
;; Hide buffers on other workspaces
;; Hide buffers on other workspaces again.
(unless exwm-workspace-show-all-buffers
(dolist (pair exwm--id-buffer-alist)
(with-current-buffer (cdr pair)
@ -808,20 +808,20 @@ INDEX must not exceed the current number of workspaces."
(rename-buffer (concat " " (buffer-name)))))))))))
(when buffer-or-name
(with-current-buffer buffer-or-name
(if (eq major-mode 'exwm-mode)
;; EXWM buffer.
(if (eq exwm--frame exwm-workspace--current)
;; On the current workspace.
(if (not exwm--floating-frame)
(switch-to-buffer buffer-or-name)
;; Select the floating frame.
(select-frame-set-input-focus exwm--floating-frame)
(select-window (frame-root-window exwm--floating-frame)))
;; On another workspace.
(exwm-workspace-move-window exwm-workspace--current
exwm--id))
;; Ordinary buffer.
(switch-to-buffer buffer-or-name)))))
(if (not (eq major-mode 'exwm-mode))
;; Ordinary buffer.
(let ((window (get-buffer-window buffer-or-name t)))
(if window
(select-window window)
(switch-to-buffer buffer-or-name)))
;; EXWM buffer.
(unless (eq exwm--frame exwm-workspace--current)
(exwm-workspace-switch exwm--frame))
(if (not exwm--floating-frame)
(switch-to-buffer buffer-or-name)
;; Select the floating frame.
(select-frame-set-input-focus exwm--floating-frame)
(select-window (frame-root-window exwm--floating-frame)))))))
(defun exwm-workspace-rename-buffer (newname)
"Rename a buffer."