diff options
| author | Glenn Morris | 2010-10-23 14:19:02 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-23 14:19:02 -0700 |
| commit | a102db1ee5f685946a5a7631dba596246aa82408 (patch) | |
| tree | 1eeed99e065fad883d61545fc6d6b9044dac4a9d /src | |
| parent | 6e82cf1a1db9e6eb1448e4df02b65d6504507d49 (diff) | |
| download | emacs-a102db1ee5f685946a5a7631dba596246aa82408.tar.gz emacs-a102db1ee5f685946a5a7631dba596246aa82408.zip | |
* src/xdisp.c (syms_of_xdisp) <hourglass-delay>: Sync doc with Lisp.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 97afc4995af..eeac05706f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,7 +2,7 @@ | |||
| 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, display-hourglass>: | 4 | * xdisp.c (syms_of_xdisp) <auto-hscroll-mode, display-hourglass>: |
| 5 | Sync docs with Lisp. | 5 | <hourglass-delay>: Sync docs with Lisp. |
| 6 | 6 | ||
| 7 | 2010-10-23 Eli Zaretskii <eliz@gnu.org> | 7 | 2010-10-23 Eli Zaretskii <eliz@gnu.org> |
| 8 | 8 | ||
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. */); | |||
| 26587 | display_hourglass_p = 1; | 26587 | display_hourglass_p = 1; |
| 26588 | 26588 | ||
| 26589 | DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay, | 26589 | DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay, |
| 26590 | doc: /* *Seconds to wait before displaying an hourglass pointer. | 26590 | doc: /* *Seconds to wait before displaying an hourglass pointer when Emacs is busy. */); |
| 26591 | Value must be an integer or float. */); | ||
| 26592 | Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY); | 26591 | Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY); |
| 26593 | 26592 | ||
| 26594 | hourglass_atimer = NULL; | 26593 | hourglass_atimer = NULL; |