emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix void-variable list error in multi-state binds

Browse source 
Caused by overzealous re-setting of a variable in a loop, when it should
only be set once.
This commit is contained in:
Henrik Lissner 2018-12-22 05:20:43 -05:00
parent 5e33fefd74
commit 4d3587c8d0
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/core-keybinds.el
View file

@ -238,14 +238,17 @@ For example, :nvi will map to (list 'normal 'visual 'insert). See
(when (or (memq 'global states) (null states))
(setq states (delq 'global states))
(push 'nil states))
(dolist (state states)
(if (and (listp def)
(memq (car-safe (doom-unquote def)) '(:def :ignore :keymap)))
(setq def `(quote ,(plist-put (general--normalize-extended-def (doom-unquote def))
:which-key desc)))
(when desc
(setq def
(if (and (equal key "")
(null def))
`(quote (nil :which-key ,desc))
`(list ,@(plist-put (general--normalize-extended-def def)
:which-key desc)))))
(setq def `(list ,@(cond ((and (equal key "")
(null def))
`(nil :which-key ,desc))
((plist-put (general--normalize-extended-def def)
:which-key desc)))))))
(dolist (state states)
(push key (alist-get state doom--map-batch-forms))
(push def (alist-get state doom--map-batch-forms))))