awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-09-12 15:36:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Run hooks only after switch-to-buffer for server

Browse Source 
When a file is visited via `emacsclient`, server.el does the following
in this order:
 - create a buffer `b` visiting the file
 - run `(set-buffer b)`
 - trigger `server-visit-hook`
 - run `(switch-buffer b)`
 - trigger `server-switch-hook`

Thus, the right hook for `doom-run-switch-buffer-hooks-h` is
`server-switch-hook` because the "switch buffer" hooks may assume that
the buffer has already been switched to.

This fixes an org error that occurs when running

    emacsclient --create-file --no-wait foo.txt

while there's a frame containing an org-roam file. Without this commit,
the server will create a new frame and set the current buffer to
foo.txt. But the new frame will still display the (duplicated) window
for the org-roam file. Then `server-visit-hook` will be triggered and
eventually run `+org-roam-manage-backlinks-buffer-h`, which will try to
enable the org-roam backlinks buffer. But this will error because the
current buffer is not an org(-roam) buffer.

Amend: 4a6de2419c
This commit is contained in:
Tim Ruffing
2025-09-03 12:12:40 +02:00
committed by Henrik Lissner
parent d887b721da
commit 2395228ff8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/doom-ui.el
View File

@@ -737,7 +737,7 @@ triggering hooks during startup."
(add-hook 'window-selection-change-functions #'doom-run-switch-window-hooks-h)
(add-hook 'window-buffer-change-functions #'doom-run-switch-buffer-hooks-h)
;; `window-buffer-change-functions' doesn't trigger for files visited via the server.
(add-hook 'server-visit-hook #'doom-run-switch-buffer-hooks-h))
(add-hook 'server-switch-hook #'doom-run-switch-buffer-hooks-h))
;; Apply fonts and theme
(let ((hook (if (daemonp)