mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

* lisp/subr.el (read-char-choice): Allow quitting. (Bug#9001)

Browse Source
This commit is contained in:
Glenn Morris 2011-07-15 18:53:39 -04:00
parent 4baf28e616
commit 6ccf7859d6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2011-07-15 Glenn Morris <rgm@gnu.org>
* subr.el (read-char-choice): Allow quitting. (Bug#9001)
2011-07-09 Lawrence Mitchell <wence@gmx.li>
* net/gnutls.el (gnutls-min-prime-bits): New variable.

4
lisp/subr.el
View File

@ -2161,7 +2161,9 @@ keyboard-quit events while waiting for a valid input."
;; read-event returns -1 if we are in a kbd macro and
;; there are no more events in the macro. Attempt to
;; get an event interactively.
(setq executing-kbd-macro nil)))))
(setq executing-kbd-macro nil))
((and (not inhibit-keyboard-quit) (eq char ?\C-g))
(keyboard-quit)))))
;; Display the question with the answer. But without cursor-in-echo-area.
(message "%s%s" prompt (char-to-string char))
char))