emacs
/
evil-collection
mirror of https://github.com/jojojames/evil-collection.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Catch errors in evil-collection-define-key 

Like errors related to prefix keys already being defined
This commit is contained in:
Justin Burkett 2019-08-16 11:20:22 -04:00 committed by James N
parent d226a50061
commit 31ba858177
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
evil-collection.el
View File

@ -305,8 +305,12 @@ function adds the ability to filter keys on the basis of
(setq filtered-bindings (nreverse filtered-bindings))
(cond ((null filtered-bindings))
((and (boundp map-sym) (keymapp (symbol-value map-sym)))
(apply #'evil-define-key*
state (symbol-value map-sym) filtered-bindings))
(condition-case-unless-debug err
(apply #'evil-define-key*
state (symbol-value map-sym) filtered-bindings)
(error
(message "evil-collection: error setting key in %s %S"
map-sym err))))
((boundp map-sym)
(user-error "evil-collection: %s is not a keymap" map-sym))
(t
@ -315,8 +319,15 @@ function adds the ability to filter keys on the basis of
(fset fun `(lambda (&rest args)
(when (and (boundp ',map-sym) (keymapp ,map-sym))
(remove-hook 'after-load-functions #',fun)
(apply #'evil-define-key*
',state ,map-sym ',filtered-bindings))))
(condition-case-unless-debug err
(apply #'evil-define-key*
',state ,map-sym ',filtered-bindings)
(error
(message
,(format
"evil-collection: error setting key in %s %%S"
map-sym)
err))))))
(add-hook 'after-load-functions fun t))))))
(defun evil-collection-inhibit-insert-state (map-sym)