leoliu pushed a commit to branch master in repository elpa. commit 81d7ca20db812d7ddd6716119bcae36c3bc4cbb6 Author: Leo Liu <sdl....@gmail.com> Date: Thu Dec 12 17:55:55 2013 +0800
In no case should easy-kill-activate-keymap err --- easy-kill.el | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/easy-kill.el b/easy-kill.el index cdb78c9..a42e2a4 100644 --- a/easy-kill.el +++ b/easy-kill.el @@ -345,18 +345,22 @@ candidate property instead." map (lambda () ;; Prevent any error from activating the keymap forever. - (with-demoted-errors - (or (and (not (and (symbolp this-command) - (get this-command 'easy-kill-exit))) - (or (eq this-command (lookup-key map (this-single-command-keys))) - (let ((cmd (key-binding (this-single-command-keys) nil t))) - (command-remapping cmd nil (list map))))) - (ignore - (easy-kill-destroy-candidate) - (unless (or easy-kill-mark - (and (symbolp this-command) - (get this-command 'easy-kill-exit))) - (easy-kill-save-candidate))))))))) + (condition-case err + (or (and (not (and (symbolp this-command) + (get this-command 'easy-kill-exit))) + (or (eq this-command + (lookup-key map (this-single-command-keys))) + (let ((cmd (key-binding + (this-single-command-keys) nil t))) + (command-remapping cmd nil (list map))))) + (ignore + (easy-kill-destroy-candidate) + (unless (or easy-kill-mark + (and (symbolp this-command) + (get this-command 'easy-kill-exit))) + (easy-kill-save-candidate)))) + (error (message "%s:%s" this-command (error-message-string err)) + nil)))))) ;;;###autoload (defun easy-kill (&optional n)