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

Inhibit recursive switch-hooks in sub-hooks too

Browse source
This commit is contained in:
Henrik Lissner 2018-06-08 14:52:22 +02:00
parent 14890376b1
commit d4869228f5
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
core/core-ui.el
View file

@ -379,31 +379,32 @@ from the default."
(window-minibuffer-p) (window-minibuffer-p)
(window-minibuffer-p window)) (window-minibuffer-p window))
(funcall orig-fn window norecord) (funcall orig-fn window norecord)
(run-hooks 'doom-before-switch-window-hook) (let ((doom-inhibit-switch-window-hooks t))
(prog1 (run-hooks 'doom-before-switch-window-hook)
(let ((doom-inhibit-switch-window-hooks t)) (prog1 (funcall orig-fn window norecord)
(funcall orig-fn window norecord)) (with-selected-window window
(with-selected-window window (run-hooks 'doom-after-switch-window-hook))))))
(run-hooks 'doom-after-switch-window-hook)))))
(defun doom*switch-buffer-hooks (orig-fn buffer-or-name &rest args) (defun doom*switch-buffer-hooks (orig-fn buffer-or-name &rest args)
(let ((dest (get-buffer buffer-or-name))) (let ((dest (get-buffer buffer-or-name)))
(if (or doom-inhibit-switch-buffer-hooks (if (or doom-inhibit-switch-buffer-hooks
(null dest) (null dest)
(eq dest (current-buffer))) (eq dest (current-buffer)))
(apply orig-fn dest args) (apply orig-fn dest args)
(run-hooks 'doom-before-switch-buffer-hook) (let ((doom-inhibit-switch-buffer-hooks t))
(prog1 (run-hooks 'doom-before-switch-buffer-hook)
(let ((doom-inhibit-switch-buffer-hooks t)) (prog1 (apply orig-fn dest args)
(apply orig-fn dest args)) (with-current-buffer dest
(with-current-buffer dest (run-hooks 'doom-after-switch-buffer-hook)))))))
(run-hooks 'doom-after-switch-buffer-hook))))))
(defun doom|init-custom-hooks () (defun doom|init-custom-hooks (&optional disable)
(advice-add #'select-frame :around #'doom*switch-frame-hooks) (dolist (spec '((select-frame . doom*switch-frame-hooks)
(advice-add #'select-window :around #'doom*switch-window-hooks) (select-window . doom*switch-window-hooks)
(advice-add #'switch-to-buffer :around #'doom*switch-buffer-hooks) (switch-to-buffer . doom*switch-buffer-hooks)
(advice-add #'display-buffer :around #'doom*switch-buffer-hooks) (display-buffer . doom*switch-buffer-hooks)
(advice-add #'pop-to-buffer :around #'doom*switch-buffer-hooks)) (pop-to-buffer . doom*switch-buffer-hooks)))
(if disable
(advice-remove (car spec) (cdr spec))
(advice-add (car spec) :around (cdr spec)))))
(add-hook 'doom-post-init-hook #'doom|init-custom-hooks) (add-hook 'doom-post-init-hook #'doom|init-custom-hooks)
(defun doom*load-theme-hooks (theme &rest _) (defun doom*load-theme-hooks (theme &rest _)