# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1160440382 0
# Node ID 3dc812144482317f4786416d3d1d396014dd63c2
# Parent  df3186ae09539665b467b1ae7d1c41da2ca4dd04
	* minibuf.c (temp_echo_area_glyphs): Sit for
	`minibuffer-message-timeout' seconds.

diff -r df3186ae0953 -r 3dc812144482 src/ChangeLog
--- a/src/ChangeLog	Mon Oct 09 23:34:11 2006 +0000
+++ b/src/ChangeLog	Tue Oct 10 00:33:02 2006 +0000
@@ -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 -r df3186ae0953 -r 3dc812144482 src/minibuf.c
--- a/src/minibuf.c	Mon Oct 09 23:34:11 2006 +0000
+++ b/src/minibuf.c	Tue Oct 10 00:33:02 2006 +0000
@@ -2692,6 +2692,8 @@
    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 @@
   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))