summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-10-23 14:16:39 -0700
committerGlenn Morris <rgm@gnu.org>2010-10-23 14:16:39 -0700
commit6e82cf1a1db9e6eb1448e4df02b65d6504507d49 (patch)
treeb22358e6a33d72a3e740b65f3c9b13333d9fb291
parent66c6abf0d76aad59cf5defee7ea63f9fb356839d (diff)
downloademacs-6e82cf1a1db9e6eb1448e4df02b65d6504507d49.tar.gz
emacs-6e82cf1a1db9e6eb1448e4df02b65d6504507d49.tar.bz2
emacs-6e82cf1a1db9e6eb1448e4df02b65d6504507d49.zip
* src/xdisp.c (syms_of_xdisp) <display-hourglass>: Sync doc with Lisp.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xdisp.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3fa7d87cd4c..97afc4995af 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,8 @@
2010-10-23 Glenn Morris <rgm@gnu.org>
* buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>:
- * xdisp.c (syms_of_xdisp) <auto-hscroll-mode>: Sync docs with Lisp.
+ * xdisp.c (syms_of_xdisp) <auto-hscroll-mode, display-hourglass>:
+ Sync docs with Lisp.
2010-10-23 Eli Zaretskii <eliz@gnu.org>
diff --git a/src/xdisp.c b/src/xdisp.c
index 359d25342ab..ce679b2d75e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26581,7 +26581,9 @@ baseline. The default value is 1. */);
underline_minimum_offset = 1;
DEFVAR_BOOL ("display-hourglass", &display_hourglass_p,
- doc: /* Non-zero means Emacs displays an hourglass pointer on window systems. */);
+ doc: /* Non-nil means show an hourglass pointer, when Emacs is busy.
+This feature only works when on a window system that can change
+cursor shapes. */);
display_hourglass_p = 1;
DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay,