# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1212934250 0
# Node ID b88c2237c3e7620124d6f929c8f8caf0aa9fe103
# Parent  d4f0cb2dfc4d762d32b7c0f2fb829c5e9054dec4
(minibuffer-message): Bind inhibit-quit around
sit-for.

diff -r d4f0cb2dfc4d -r b88c2237c3e7 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jun 08 13:02:38 2008 +0000
+++ b/lisp/ChangeLog	Sun Jun 08 14:10:50 2008 +0000
@@ -1,3 +1,8 @@
+2008-06-08  Andreas Schwab  <schwab@suse.de>
+
+	* minibuffer.el (minibuffer-message): Bind inhibit-quit around
+	sit-for.
+
 2008-06-08  Martin Rudalics  <rudalics@gmx.at>
 
 	* window.el (split-height-threshold, split-width-threshold): Add
diff -r d4f0cb2dfc4d -r b88c2237c3e7 lisp/minibuffer.el
--- a/lisp/minibuffer.el	Sun Jun 08 13:02:38 2008 +0000
+++ b/lisp/minibuffer.el	Sun Jun 08 14:10:50 2008 +0000
@@ -281,7 +281,10 @@
                     (copy-sequence message)
                   (concat " [" message "]")))
   (when args (setq message (apply 'format message args)))
-  (let ((ol (make-overlay (point-max) (point-max) nil t t)))
+  (let ((ol (make-overlay (point-max) (point-max) nil t t))
+	;; A quit during sit-for should be (re-)read as
+	;; abort-recursive-edit
+	(inhibit-quit t))
     (unwind-protect
         (progn
           (unless (zerop (length message))