From: Andreas Schwab <schwab@suse.de>
Date: Sun, 8 Jun 2008 14:10:50 +0000 (+0000)
Subject: (minibuffer-message): Bind inhibit-quit around
X-Git-Tag: emacs-pretest-23.0.90~5004
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=24f7ee4cee91afc419cf916859da3041b6086562;p=emacs.git

(minibuffer-message): Bind inhibit-quit around
sit-for.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae82adca289..5521c6b7ddd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 2582afab3c1..2be39d23dde 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -281,7 +281,10 @@ If ARGS are provided, then pass MESSAGE through `format'."
                     (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))