TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for #4204: Don't bind if emacs leader is "" 

When we try to bind leader + "m" and leader is the empty string, we end
up binding to "m" directly which makes "m" all but unusable.
This commit is contained in:
justbur 2015-12-17 11:06:37 -05:00 committed by syl20bnr
parent 0b02475772
commit bcdf346cb9
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/core-keybindings.el
View File

@ -106,24 +106,40 @@ pairs. For example,
(defalias 'evil-leader/set-key 'spacemacs/set-leader-keys)
(defun spacemacs//acceptable-leader-p (key)
"Return t if key is a string and non-empty."
(and (stringp key) (not (string= key ""))))
(defun spacemacs//init-leader-mode-map (mode map &optional minor)
"Check for MAP-prefix. If it doesn't exist yet, use `bind-map'
to create it and bind it to `dotspacemacs-major-mode-leader-key'
and `dotspacemacs-major-mode-emacs-leader-key'. If MODE is a
minor-mode, the third argument should be non nil."
(let ((prefix (intern (format "%s-prefix" map))))
(let* ((prefix (intern (format "%s-prefix" map)))
(leader1 (when (spacemacs//acceptable-leader-p
dotspacemacs-major-mode-leader-key)
dotspacemacs-major-mode-leader-key))
(leader2 (when (spacemacs//acceptable-leader-p
dotspacemacs-leader-key)
(concat dotspacemacs-leader-key
(unless minor " m"))))
(emacs-leader1 (when (spacemacs//acceptable-leader-p
dotspacemacs-major-mode-emacs-leader-key)
dotspacemacs-major-mode-emacs-leader-key))
(emacs-leader2 (when (spacemacs//acceptable-leader-p
dotspacemacs-emacs-leader-key)
(concat dotspacemacs-emacs-leader-key
(unless minor " m"))))
(leaders (-non-nil (list leader1 leader2)))
(emacs-leaders (-non-nil (list emacs-leader1 emacs-leader2))))
(or (boundp prefix)
(progn
(eval
`(bind-map ,map
:prefix-cmd ,prefix
,(if minor :minor-modes :major-modes) (,mode)
:keys (,dotspacemacs-major-mode-emacs-leader-key
,(concat dotspacemacs-emacs-leader-key
(unless minor " m")))
:evil-keys (,dotspacemacs-major-mode-leader-key
,(concat dotspacemacs-leader-key
(unless minor " m")))))
:keys ,emacs-leaders
:evil-keys ,leaders))
(boundp prefix)))))
(defun spacemacs/set-leader-keys-for-major-mode (mode key def &rest bindings)