[bbatsov#1335] Workaround for which-key display bug (bbatsov#1349)

stefankeidel · Oct 4, 2022 · 589d462 · 589d462
1 parent b1385a1
commit 589d462
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@
 ### Bugs fixed
 
 * Fix `company` still being visible in the mode line.
+* [#1335](https://github.com/bbatsov/prelude/issues/1335): Workaround
+  for `which-key` bug causing display issues in clients to `emacs --daemon`.
 * Fix **Edit on GitHub** link in ReadTheDocs site.
 
 ## 1.1.0 (2021-02-14)

diff --git a/core/prelude-ui.el b/core/prelude-ui.el
@@ -83,8 +83,12 @@
   (load-theme prelude-theme t))
 
 ;; show available keybindings after you start typing
-(require 'which-key)
-(which-key-mode +1)
+;; add to hook when running as a daemon as a workaround for a
+;; which-key bug
+;; https://github.com/justbur/emacs-which-key/issues/306
+(if (daemonp)
+    (add-hook 'server-after-make-frame-hook 'which-key-mode)
+  (which-key-mode +1))
 
 (provide 'prelude-ui)
 ;;; prelude-ui.el ends here