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

Extend switch-buffer hook coverage

Browse source 
To cover switch-to-{next,prev}-buffer commands, which are used in quite
a few places, but don't implicitly trigger switch-buffer hooks.

Also removes switch-{window,buffer,frame} logging. Adds too much noise,
which isn't very helpful.

Also fixes VC state not being refreshed when switching to stale buffers
in certain ways.
This commit is contained in:
Henrik Lissner 2019-05-02 23:08:47 -04:00
parent 388e0def2c
commit 3bebf3ac9b
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/core-ui.el
View file

@ -91,7 +91,6 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.")
(minibufferp)) (minibufferp))
(let ((doom-inhibit-switch-window-hooks t)) (let ((doom-inhibit-switch-window-hooks t))
(run-hooks 'doom-switch-window-hook) (run-hooks 'doom-switch-window-hook)
(doom-log "Window switched to %s" (selected-window))
(setq doom--last-window (selected-window))))) (setq doom--last-window (selected-window)))))
(defun doom|run-switch-frame-hooks (&rest _) (defun doom|run-switch-frame-hooks (&rest _)
@ -100,20 +99,26 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.")
(frame-parameter nil 'parent-frame)) (frame-parameter nil 'parent-frame))
(let ((doom-inhibit-switch-frame-hooks t)) (let ((doom-inhibit-switch-frame-hooks t))
(run-hooks 'doom-switch-frame-hook) (run-hooks 'doom-switch-frame-hook)
(doom-log "Frame switched to %s" (selected-frame))
(setq doom--last-frame (selected-frame))))) (setq doom--last-frame (selected-frame)))))
(defun doom*run-switch-buffer-hooks (orig-fn buffer-or-name &rest args) (defun doom*run-switch-buffer-hooks (orig-fn &rest args)
(if (or doom-inhibit-switch-buffer-hooks (if (or doom-inhibit-switch-buffer-hooks
(if (eq orig-fn 'switch-to-buffer) (if (eq orig-fn 'switch-to-buffer)
(car args) ; norecord (car args) ; norecord
(eq (get-buffer buffer-or-name) (current-buffer)))) (eq (car args) (current-buffer)))) ; buffer-or-name
(apply orig-fn buffer-or-name args) (apply orig-fn args)
(let ((doom-inhibit-switch-buffer-hooks t)) (let ((doom-inhibit-switch-buffer-hooks t))
(doom-log "Buffer switched in %s" (selected-window)) (prog1 (apply orig-fn args)
(prog1 (apply orig-fn buffer-or-name args)
(run-hooks 'doom-switch-buffer-hook))))) (run-hooks 'doom-switch-buffer-hook)))))
(defun doom*run-switch-to-next-prev-buffer-hooks (orig-fn &rest args)
(if doom-inhibit-switch-buffer-hooks
(apply orig-fn args)
(let ((doom-inhibit-switch-buffer-hooks t))
(when-let* ((result (apply orig-fn args)))
(run-hooks 'doom-switch-buffer-hook)
result))))
(defun doom*run-load-theme-hooks (theme &optional _no-confirm no-enable) (defun doom*run-load-theme-hooks (theme &optional _no-confirm no-enable)
"Set up `doom-load-theme-hook' to run after `load-theme' is called." "Set up `doom-load-theme-hook' to run after `load-theme' is called."
(unless no-enable (unless no-enable
@ -526,7 +531,10 @@ frames, however. There's always `doom/reload-theme' if you need it!"
;; + `doom-switch-frame-hook' ;; + `doom-switch-frame-hook'
(add-hook 'buffer-list-update-hook #'doom|run-switch-window-hooks) (add-hook 'buffer-list-update-hook #'doom|run-switch-window-hooks)
(add-hook 'focus-in-hook #'doom|run-switch-frame-hooks) (add-hook 'focus-in-hook #'doom|run-switch-frame-hooks)
(advice-add! '(switch-to-buffer display-buffer) :around #'doom*run-switch-buffer-hooks)) (advice-add! '(switch-to-next-buffer switch-to-prev-buffer)
:around #'doom*run-switch-to-next-prev-buffer-hooks)
(advice-add! '(switch-to-buffer display-buffer)
:around #'doom*run-switch-buffer-hooks))
;; Apply `doom-theme' ;; Apply `doom-theme'
(unless (daemonp) (unless (daemonp)