Skip to content

Commit 0fdbc84

Browse files
ryukinixbbatsov
authored andcommitted
fix: avoid terminal daemoned session crash with helm-everywhere
Closes #1419
1 parent 3cf24d8 commit 0fdbc84

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

core/prelude-ui.el

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,27 @@
8282
(when prelude-theme
8383
(load-theme prelude-theme t))
8484

85+
86+
;; NOTE(@lerax): dom 01 jun 2025 12:42:24
87+
;; helm-descbinds became incompatible with which-key-mode ins 202402XX version
88+
;; Using prelude, calling which-key-mode as hook in
89+
;; server-after-make-frame-hook crash terminal daemoned session
90+
;; this function prevents to this happen
91+
(defun prelude-safe-which-key-mode ()
92+
(condition-case err
93+
(which-key-mode +1)
94+
(error
95+
(let ((error-message (cadr err)))
96+
(with-temp-message "" ;; don't print to minibuffer
97+
(message "[Prelude] bypass error: %s" error-message))))))
98+
8599
;; show available keybindings after you start typing
86100
;; add to hook when running as a daemon as a workaround for a
87101
;; which-key bug
88102
;; https://github.com/justbur/emacs-which-key/issues/306
89103
(if (daemonp)
90-
(add-hook 'server-after-make-frame-hook 'which-key-mode)
91-
(which-key-mode +1))
104+
(add-hook 'server-after-make-frame-hook #'prelude-safe-which-key-mode)
105+
(prelude-safe-which-key-mode))
92106

93107
(provide 'prelude-ui)
94108
;;; prelude-ui.el ends here

0 commit comments

Comments
 (0)