diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44cc4c78616..2403ab0491c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-08-21 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * subr.el (read-key): Don't echo keystrokes (bug#6883). | ||
| 4 | |||
| 1 | 2010-08-21 Glenn Morris <rgm@gnu.org> | 5 | 2010-08-21 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * menu-bar.el (menu-bar-games-menu): Add landmark. | 7 | * menu-bar.el (menu-bar-games-menu): Add landmark. |
diff --git a/lisp/subr.el b/lisp/subr.el index ad939dc6bb4..a4a0996a726 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -1818,6 +1818,7 @@ When there's an ambiguity because the key looks like the prefix of | |||
| 1818 | some sort of escape sequence, the ambiguity is resolved via `read-key-delay'." | 1818 | some sort of escape sequence, the ambiguity is resolved via `read-key-delay'." |
| 1819 | (let ((overriding-terminal-local-map read-key-empty-map) | 1819 | (let ((overriding-terminal-local-map read-key-empty-map) |
| 1820 | (overriding-local-map nil) | 1820 | (overriding-local-map nil) |
| 1821 | (echo-keystrokes 0) | ||
| 1821 | (old-global-map (current-global-map)) | 1822 | (old-global-map (current-global-map)) |
| 1822 | (timer (run-with-idle-timer | 1823 | (timer (run-with-idle-timer |
| 1823 | ;; Wait long enough that Emacs has the time to receive and | 1824 | ;; Wait long enough that Emacs has the time to receive and |