From f761d1e389e06a559cedd9155f7383cbac36c0a7 Mon Sep 17 00:00:00 2001 From: JAremko Date: Sun, 6 Dec 2020 06:24:54 +0200 Subject: [PATCH] cleanup --- core/core-keybindings.el | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/core/core-keybindings.el b/core/core-keybindings.el index a4b015d68..89981438d 100644 --- a/core/core-keybindings.el +++ b/core/core-keybindings.el @@ -73,34 +73,15 @@ used as the prefix command." (concat dotspacemacs-major-mode-emacs-leader-key " " (substring prefix 1)))) (unless long-name (setq long-name name)) - (let ((prefix-name (cons name long-name)) - (map (intern (format "%s-map" mode)))) - ;; It should be safe to add replacements into the mode map if - ;; it exists. - ;; FIXME: Figure out how this brakes inserting spaces. - (if nil ;; ((boundp map)) - (progn - ;; NOTE: Looks like `which-key-add-keymap-based-replacements' - ;; doesn't support short + long name pair. - (which-key-add-keymap-based-replacements - (symbol-value map) full-prefix name) - (when is-major-mode-prefix - (when dotspacemacs-major-mode-leader-key - (which-key-add-keymap-based-replacements - (symbol-value map) major-mode-prefix name)) - (when dotspacemacs-major-mode-emacs-leader-key - (which-key-add-keymap-based-replacements - (symbol-value map) major-mode-prefix-emacs name)))) - (which-key-add-major-mode-key-based-replacements mode - full-prefix-emacs prefix-name - full-prefix prefix-name) - (when is-major-mode-prefix - (when dotspacemacs-major-mode-leader-key - (which-key-add-major-mode-key-based-replacements - mode major-mode-prefix prefix-name)) - (when dotspacemacs-major-mode-emacs-leader-key - (which-key-add-major-mode-key-based-replacements - mode major-mode-prefix-emacs prefix-name))))))) + (let ((prefix-name (cons name long-name))) + (which-key-add-major-mode-key-based-replacements mode + full-prefix-emacs prefix-name + full-prefix prefix-name) + (when (and is-major-mode-prefix dotspacemacs-major-mode-leader-key) + (which-key-add-major-mode-key-based-replacements mode major-mode-prefix prefix-name)) + (when (and is-major-mode-prefix dotspacemacs-major-mode-emacs-leader-key) + (which-key-add-major-mode-key-based-replacements + mode major-mode-prefix-emacs prefix-name))))) (put 'spacemacs/declare-prefix-for-mode 'lisp-indent-function 'defun) (defun spacemacs/set-leader-keys (key def &rest bindings)