aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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 @@
12010-10-23 Glenn Morris <rgm@gnu.org> 12010-10-23 Glenn Morris <rgm@gnu.org>
2 2
3 * buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>: 3 * buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>:
4 * xdisp.c (syms_of_xdisp) <auto-hscroll-mode>: Sync docs with Lisp. 4 * xdisp.c (syms_of_xdisp) <auto-hscroll-mode, display-hourglass>:
5 Sync docs with Lisp.
5 6
62010-10-23 Eli Zaretskii <eliz@gnu.org> 72010-10-23 Eli Zaretskii <eliz@gnu.org>
7 8
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. */);
26581 underline_minimum_offset = 1; 26581 underline_minimum_offset = 1;
26582 26582
26583 DEFVAR_BOOL ("display-hourglass", &display_hourglass_p, 26583 DEFVAR_BOOL ("display-hourglass", &display_hourglass_p,
26584 doc: /* Non-zero means Emacs displays an hourglass pointer on window systems. */); 26584 doc: /* Non-nil means show an hourglass pointer, when Emacs is busy.
26585This feature only works when on a window system that can change
26586cursor shapes. */);
26585 display_hourglass_p = 1; 26587 display_hourglass_p = 1;
26586 26588
26587 DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay, 26589 DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay,