From 73b8a5b49673fb922afe14e8087756a54e2d4aa9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 26 Oct 2019 21:49:15 -0400 Subject: [PATCH] Redo which-key labels for 'SPC h d' & 'SPC h r' Renders #1959 obsolete --- modules/config/default/config.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/config/default/config.el b/modules/config/default/config.el index 97a980c35..4c51e12c9 100644 --- a/modules/config/default/config.el +++ b/modules/config/default/config.el @@ -349,10 +349,13 @@ "P" #'find-library) (after! which-key - (which-key-add-key-based-replacements "C-h r" "reload") - (when (featurep 'evil) - (which-key-add-key-based-replacements (concat doom-leader-key " r") "reload") - (which-key-add-key-based-replacements (concat doom-leader-alt-key " r") "reload"))) + (let ((prefix-re (regexp-opt (list doom-leader-key doom-leader-alt-key)))) + (cl-pushnew `((,(format "\\`\\(?:<\\(?:\\(?:f1\\|help\\)>\\)\\|%s h\\) d\\'" prefix-re)) + nil . "doom") + which-key-replacement-alist) + (cl-pushnew `((,(format "\\`\\(?:<\\(?:\\(?:f1\\|help\\)>\\)\\|%s h\\) r\\'" prefix-re)) + nil . "reload") + which-key-replacement-alist))) (when (featurep! +bindings)