Adapt to which-key integration in core Emacs

The maintainers decided to disable Unicode symbols by default;
re-enable them.

Also fix the version check for Eglot and use-package.

1 files changed, 5 insertions, 3 deletions

diff --git a/.emacs b/.emacs
index 05f09f0..007ed6d 100644
--- a/.emacs
+++ b/.emacs
@@ -748,10 +748,11 @@ UPSTREAMS is a list of fetch URLs."
              page-break-lines
              rg
              rust-mode
-             which-key
              wgrep)
-           (when (<= emacs-major-version 29)
-             '(eglot use-package))))
+           (when (< emacs-major-version 29)
+             '(eglot use-package))
+           (when (< emacs-major-version 30)
+             '(which-key))))
   :config
   (my/setopt-update-list
    package-archives '(("melpa" . "https://melpa.org/packages/"))))
@@ -981,6 +982,7 @@ UPSTREAMS is a list of fetch URLs."
 
 (use-package which-key
   :custom
+  (which-key-dont-use-unicode nil)
   (which-key-idle-delay 0.5)
   (which-key-mode t)
   :delight)