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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6bfdb61330b164d8558a4b9ea7a6e5955957f517..1a2c8daed5b57f107f2d09983e21b83a2e333ce5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/subr.el b/lisp/subr.el
index 94b28c007d1ae9ddfcebc1c77644129c89bd1ff6..d462283b7bdc7aaae31ca4f96a4cec943a70b1e6 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -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))