diff options
| author | José A. Romero L. <escherdragon@gmail.com> | 2013-07-06 22:31:44 +0200 |
|---|---|---|
| committer | José A. Romero L. <escherdragon@gmail.com> | 2013-07-06 22:31:44 +0200 |
| commit | 038752d987f6a286e7b50d7148f4b7273971c19f (patch) | |
| tree | 48045620deebc17be791cd16f498d5fab9fe1fa6 | |
| parent | ee2bd72fbfcb5b35bd6096f0d3058d182b46fe9a (diff) | |
Fix use of `overriding-local-terminal-map` in emacs trunk (fix #309).
In emacs truck (git:a760a079aba36493e97) the behaviour of
`overriding-local-terminal-map` changed, so we have to use
`overriding-local-map` now.
| -rw-r--r-- | CHANGES.org | 5 | ||||
| -rw-r--r-- | evil-common.el | 5 | ||||
| -rw-r--r-- | evil.el | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES.org b/CHANGES.org index 0d0d092..2ee20c5 100644 --- a/CHANGES.org +++ b/CHANGES.org @@ -1,5 +1,10 @@ * Changes and New Features in Evil +** News in 1.0.6 + + * Fix bug induced in emacs trunk due to changed behaviour of + `overriding-terminal-local-map` (fixes #309). + ** News in 1.0.5 * Fix bug in `show-paren-mode` due to variable renaming in latest diff --git a/evil-common.el b/evil-common.el index 34ac245..e15d0d0 100644 --- a/evil-common.el +++ b/evil-common.el @@ -576,8 +576,9 @@ Both COUNT and CMD may be nil." Translates it according to the input method." (let ((old-global-map (current-global-map)) (new-global-map (make-sparse-keymap)) - (overriding-terminal-local-map evil-read-key-map) - overriding-local-map seq char cmd) + (overriding-terminal-local-map nil) + (overriding-local-map evil-read-key-map) + seq char cmd) (unwind-protect (condition-case nil (progn @@ -8,6 +8,7 @@ ;; Frank Fischer <frank.fischer at mathematik.tu-chemnitz.de> ;; Frank Terbeck <ft at bewatermyfriend.org> ;; Jonathan Claggett <jclaggett at lonocloud.com> +;; José A. Romero L. <escherdragon@gmail.com> ;; Marian Schubert <maio@netsafe.cz> ;; Michael Markert <markert.michael at googlemail.com> ;; Nikolai Weibull <now at bitwi.se> |