* minibuf.c (temp_echo_area_glyphs): Sit for

	`minibuffer-message-timeout' seconds.

diff --git a/src/ChangeLog b/src/ChangeLog
index 91e7fff4347972caf0427ebff6346bc53d226427..1a6c151b4b1e6c599e4266a37fa04bebe770de9e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-09  Chong Yidong  <cyd@stupidchicken.com>
+
+       * minibuf.c (temp_echo_area_glyphs): Sit for
+       `minibuffer-message-timeout' seconds.
+
 2006-10-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * macterm.c (mac_draw_image_string, mac_draw_image_string_16): Add

diff --git a/src/minibuf.c b/src/minibuf.c
index ea065a6b4e847f5fc51c82c416eeaad152c5e6c9..19b06acc471421d0004efe0ef0494fa8d49d9c98 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2692,6 +2692,8 @@ If no minibuffer is active, return nil.  */)
    that has no possible completions, and other quick, unobtrusive
    messages.  */
 
+extern Lisp_Object Vminibuffer_message_timeout;
+
 void
 temp_echo_area_glyphs (string)
      Lisp_Object string;
@@ -2710,7 +2712,15 @@ temp_echo_area_glyphs (string)
   insert_from_string (string, 0, 0, SCHARS (string), SBYTES (string), 0);
   SET_PT_BOTH (opoint, opoint_byte);
   Vinhibit_quit = Qt;
-  sit_for (make_number (2), 0, 2);
+
+  if (NUMBERP (Vminibuffer_message_timeout))
+    {
+      if (Fgtr (Vminibuffer_message_timeout, make_number (0)))
+       sit_for (Vminibuffer_message_timeout, 0, 2);
+    }
+  else
+    sit_for (make_number (-1), 0, 2);
+
   del_range_both (osize, osize_byte, ZV, ZV_BYTE, 1);
   SET_PT_BOTH (opoint, opoint_byte);
   if (!NILP (Vquit_flag))