emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use frame's buffer-predicate instead of doom/{next,previous}-buffer

Browse source 
doom/{next,previous}-buffer was implemented so that these commands could
skip over unreal buffers, and land us on either a real one or the
dashboard. Using the frame's buffer-predicate parameter accomplishes
exactly this, natively.
This commit is contained in:
Henrik Lissner 2018-02-01 19:01:49 -05:00
parent c9e8be1f60
commit 2989296521
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
5 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/feature/workspaces/autoload/workspaces.el
View file

@ -48,6 +48,12 @@
"Return non-nil if buffer is in workspace (defaults to current workspace)."
(persp-contain-buffer-p buffer (or workspace (+workspace-current)) nil))
;;;###autoload
(defun +workspace-alien-buffer-p (buffer)
"Return non-nil if BUFFER isn't a member of the current workspace."
(and (get-buffer-window buffer)
(not (+workspace-contains-buffer-p buffer))))
;; --- Getters ----------------------------

9
modules/feature/workspaces/config.el
View file

@ -70,10 +70,9 @@ Uses `+workspaces-main' to determine the name of the main workspace."
persp-set-last-persp-for-new-frames t
persp-switch-to-added-buffer nil
persp-remove-buffers-from-nil-persp-behaviour nil
;; Don't auto-load on startup
persp-auto-resume-time -1
;; auto-save on kill
persp-auto-save-opt (if noninteractive 0 1))
persp-set-frame-buffer-predicate #'doom-buffer-frame-predicate
persp-auto-resume-time -1 ; Don't auto-load on startup
persp-auto-save-opt (if noninteractive 0 1)) ; auto-save on kill
(add-hook 'persp-mode-hook #'+workspaces|init-persp-mode)
;; Modify `delete-window' to close the workspace if used on the last window
@ -100,6 +99,7 @@ Uses `+workspaces-main' to determine the name of the main workspace."
;;
(defun +workspaces|init-persp-mode ()
(cond (persp-mode
(add-hook 'doom-unreal-buffer-functions #'+workspace-alien-buffer-p)
;; Ensure `persp-kill-buffer-query-function' is last in
;; kill-buffer-query-functions
(remove-hook 'kill-buffer-query-functions 'persp-kill-buffer-query-function)
@ -111,6 +111,7 @@ Uses `+workspaces-main' to determine the name of the main workspace."
(advice-add #'display-buffer :after #'+workspaces*auto-add-buffer)
(advice-add #'doom-buffer-list :override #'+workspace-buffer-list))
(t
(remove-hook 'doom-unreal-buffer-functions #'+workspace-alien-buffer-p)
(advice-remove #'switch-to-buffer #'+workspaces*auto-add-buffer)
(advice-remove #'display-buffer #'+workspaces*auto-add-buffer)
(advice-remove #'doom-buffer-list #'+workspace-buffer-list))))