diff options
| author | Frank Fischer <frank.fischer@mathematik.tu-chemnitz.de> | 2013-02-27 09:43:07 +0100 |
|---|---|---|
| committer | Frank Fischer <frank.fischer@mathematik.tu-chemnitz.de> | 2013-02-27 09:43:07 +0100 |
| commit | d6937eb7b12ba5158366e1bbe963e8b898f5a49d (patch) | |
| tree | 8ffef8ad213bdfc246302c89faaa4ef6fcb5ef74 /evil-tests.el | |
| parent | 40bf76f34821d38cf0e0ae4b85602b0d41ad4d62 (diff) | |
Handle ESC -> escape translation in `input-decode-map` (fix #264)
The old ESC -> escape translation code relied on a certain handling of
the keymap code in Emacs' core. This handling has changed in Emacs
24.3 and cause bug #264 and the related Emacs bugs 13709, 13793.
The new code handles this transition not in a high-precedence minor
mode map but directly in `input-decode-map`. An incoming ESC event is
translated to either 'escape or to the default ESC prefix map
originally bound to ESC in `input-decode-map`.
Diffstat (limited to 'evil-tests.el')
| -rw-r--r-- | evil-tests.el | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/evil-tests.el b/evil-tests.el index 2c04e42..55c57de 100644 --- a/evil-tests.el +++ b/evil-tests.el @@ -542,8 +542,7 @@ the end of the execution of BODY." (defun evil-test-state-keymaps (state) "Verify that STATE's keymaps are pushed to the top" (let ((actual (evil-state-keymaps state)) - (expected `((evil-esc-mode . ,evil-esc-map) - (,(evil-state-property state :local) + (expected `((,(evil-state-property state :local) . , (evil-state-property state :local-keymap t)) (,(evil-state-property state :mode) . ,(evil-state-property state :keymap t))))) @@ -551,8 +550,7 @@ the end of the execution of BODY." (cond ((eq state 'operator) (setq expected - `((evil-esc-mode . ,evil-esc-map) - (evil-operator-shortcut-mode + `((evil-operator-shortcut-mode . ,evil-operator-shortcut-map) (evil-operator-state-local-minor-mode . ,evil-operator-state-local-map) @@ -571,10 +569,7 @@ the end of the execution of BODY." (should (equal actual expected)) (dolist (map actual) (setq map (cdr-safe map)) - (should (keymapp map)) - ;; Emacs state disables `evil-esc-map' - (unless (and (eq state 'emacs) (eq map evil-esc-map)) - (should (memq map (current-active-maps)))))))) + (should (keymapp map)))))) (ert-deftest evil-test-exit-normal-state () "Enter Normal state and then disable all states" |