Merge pull request #1299 from jochu/patch-1

Escape key regexps when building which-key leader prefix
This commit is contained in:
Henrik Lissner 2019-04-02 00:30:05 -04:00 committed by GitHub
commit cd68044b5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -124,8 +124,8 @@ If any hook returns non-nil, all hooks after it are ignored.")
(concat "\\(?:" (concat "\\(?:"
(cl-loop for key in (append (list doom-leader-key doom-leader-alt-key) (cl-loop for key in (append (list doom-leader-key doom-leader-alt-key)
(where-is-internal 'doom/leader)) (where-is-internal 'doom/leader))
if (stringp key) collect key into keys if (stringp key) collect (regexp-quote key) into keys
else collect (key-description key) into keys else collect (regexp-quote (key-description key)) into keys
finally return (string-join keys "\\|")) finally return (string-join keys "\\|"))
"\\)")))) "\\)"))))
(add-hook 'doom-after-init-modules-hook #'doom|init-leader-keys) (add-hook 'doom-after-init-modules-hook #'doom|init-leader-keys)