From: Glenn Morris <rgm@gnu.org>
Date: Sat, 23 Oct 2010 21:19:02 +0000 (-0700)
Subject: * src/xdisp.c (syms_of_xdisp) <hourglass-delay>: Sync doc with Lisp.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~502
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a102db1ee5f685946a5a7631dba596246aa82408;p=emacs.git

* src/xdisp.c (syms_of_xdisp) <hourglass-delay>: Sync doc with Lisp.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 97afc4995af..eeac05706f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,7 +2,7 @@
 
 	* buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>:
 	* xdisp.c (syms_of_xdisp) <auto-hscroll-mode, display-hourglass>:
-	Sync docs with Lisp.
+	<hourglass-delay>: Sync docs with Lisp.
 
 2010-10-23  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/xdisp.c b/src/xdisp.c
index ce679b2d75e..c9af2ba88ec 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26587,8 +26587,7 @@ cursor shapes.  */);
   display_hourglass_p = 1;
 
   DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay,
-	       doc: /* *Seconds to wait before displaying an hourglass pointer.
-Value must be an integer or float.  */);
+	       doc: /* *Seconds to wait before displaying an hourglass pointer when Emacs is busy.  */);
   Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY);
 
   hourglass_atimer = NULL;