# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1148516335 0
# Node ID cc60343f8fd6fa251f3aa5218ac2cb6a7494b62d
# Parent  3af45cb133b8fea6b6ae0e4acd612a65fc4721e8
(with-local-quit): When handling `quit' signal,
make a chance for quit-flag to cause a quit.

diff -r 3af45cb133b8 -r cc60343f8fd6 lisp/subr.el
--- a/lisp/subr.el	Thu May 25 00:00:50 2006 +0000
+++ b/lisp/subr.el	Thu May 25 00:18:55 2006 +0000
@@ -1617,7 +1617,7 @@
 This function echoes `.' for each character that the user types.
 The user ends with RET, LFD, or ESC.  DEL or C-h rubs out.  C-u kills line.
 C-g quits; if `inhibit-quit' was non-nil around this function,
-then it returns nil if the user types C-g.
+then it returns nil if the user types C-g, but quit-flag remains set.
 
 Once the caller uses the password, it can erase the password
 by doing (clear-string STRING)."
@@ -2321,7 +2321,13 @@
   `(condition-case nil
        (let ((inhibit-quit nil))
 	 ,@body)
-     (quit (setq quit-flag t) nil)))
+     (quit (setq quit-flag t)
+	   ;; This call is to give a chance to handle quit-flag
+	   ;; in case inhibit-quit is nil.
+	   ;; Without this, it will not be handled until the next function
+	   ;; call, and that might allow it to exit thru a condition-case
+	   ;; that intends to handle the quit signal next time.
+	   (eval '(ignore nil)))))
 
 (defmacro while-no-input (&rest body)
   "Execute BODY only as long as there's no pending input.