diff options
| author | Chong Yidong | 2012-01-27 00:09:35 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-01-27 00:09:35 +0800 |
| commit | 9c69cfb72ef8e43b04531409c0f5d261e20252a2 (patch) | |
| tree | 9d3581cb64424c71179c56eea3fd58d7d1c73ceb | |
| parent | acc28cb93b4b332053381e2cdcdab3ab8c5b73f9 (diff) | |
| download | emacs-9c69cfb72ef8e43b04531409c0f5d261e20252a2.tar.gz emacs-9c69cfb72ef8e43b04531409c0f5d261e20252a2.zip | |
* src/keyboard.c (Vecho_keystrokes): Document zero value.
Fixes: debbugs:10503
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7222cfb9dd4..79fbaa411d0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-01-26 Chong Yidong <cyd@gnu.org> | 1 | 2012-01-26 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * keyboard.c (Vecho_keystrokes): Document zero value (Bug#10503). | ||
| 4 | |||
| 3 | * search.c (Fsearch_forward, Fsearch_backward): Document negative | 5 | * search.c (Fsearch_forward, Fsearch_backward): Document negative |
| 4 | repeat counts (Bug#10507). | 6 | repeat counts (Bug#10507). |
| 5 | 7 | ||
diff --git a/src/keyboard.c b/src/keyboard.c index c304439f272..c92f8f3f806 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -11835,38 +11835,39 @@ result of looking up the original command in the active keymaps. */); | |||
| 11835 | Vthis_original_command = Qnil; | 11835 | Vthis_original_command = Qnil; |
| 11836 | 11836 | ||
| 11837 | DEFVAR_INT ("auto-save-interval", auto_save_interval, | 11837 | DEFVAR_INT ("auto-save-interval", auto_save_interval, |
| 11838 | doc: /* *Number of input events between auto-saves. | 11838 | doc: /* Number of input events between auto-saves. |
| 11839 | Zero means disable autosaving due to number of characters typed. */); | 11839 | Zero means disable autosaving due to number of characters typed. */); |
| 11840 | auto_save_interval = 300; | 11840 | auto_save_interval = 300; |
| 11841 | 11841 | ||
| 11842 | DEFVAR_LISP ("auto-save-timeout", Vauto_save_timeout, | 11842 | DEFVAR_LISP ("auto-save-timeout", Vauto_save_timeout, |
| 11843 | doc: /* *Number of seconds idle time before auto-save. | 11843 | doc: /* Number of seconds idle time before auto-save. |
| 11844 | Zero or nil means disable auto-saving due to idleness. | 11844 | Zero or nil means disable auto-saving due to idleness. |
| 11845 | After auto-saving due to this many seconds of idle time, | 11845 | After auto-saving due to this many seconds of idle time, |
| 11846 | Emacs also does a garbage collection if that seems to be warranted. */); | 11846 | Emacs also does a garbage collection if that seems to be warranted. */); |
| 11847 | XSETFASTINT (Vauto_save_timeout, 30); | 11847 | XSETFASTINT (Vauto_save_timeout, 30); |
| 11848 | 11848 | ||
| 11849 | DEFVAR_LISP ("echo-keystrokes", Vecho_keystrokes, | 11849 | DEFVAR_LISP ("echo-keystrokes", Vecho_keystrokes, |
| 11850 | doc: /* *Nonzero means echo unfinished commands after this many seconds of pause. | 11850 | doc: /* Nonzero means echo unfinished commands after this many seconds of pause. |
| 11851 | The value may be integer or floating point. */); | 11851 | The value may be integer or floating point. |
| 11852 | If the value is zero, don't echo at all. */); | ||
| 11852 | Vecho_keystrokes = make_number (1); | 11853 | Vecho_keystrokes = make_number (1); |
| 11853 | 11854 | ||
| 11854 | DEFVAR_INT ("polling-period", polling_period, | 11855 | DEFVAR_INT ("polling-period", polling_period, |
| 11855 | doc: /* *Interval between polling for input during Lisp execution. | 11856 | doc: /* Interval between polling for input during Lisp execution. |
| 11856 | The reason for polling is to make C-g work to stop a running program. | 11857 | The reason for polling is to make C-g work to stop a running program. |
| 11857 | Polling is needed only when using X windows and SIGIO does not work. | 11858 | Polling is needed only when using X windows and SIGIO does not work. |
| 11858 | Polling is automatically disabled in all other cases. */); | 11859 | Polling is automatically disabled in all other cases. */); |
| 11859 | polling_period = 2; | 11860 | polling_period = 2; |
| 11860 | 11861 | ||
| 11861 | DEFVAR_LISP ("double-click-time", Vdouble_click_time, | 11862 | DEFVAR_LISP ("double-click-time", Vdouble_click_time, |
| 11862 | doc: /* *Maximum time between mouse clicks to make a double-click. | 11863 | doc: /* Maximum time between mouse clicks to make a double-click. |
| 11863 | Measured in milliseconds. The value nil means disable double-click | 11864 | Measured in milliseconds. The value nil means disable double-click |
| 11864 | recognition; t means double-clicks have no time limit and are detected | 11865 | recognition; t means double-clicks have no time limit and are detected |
| 11865 | by position only. */); | 11866 | by position only. */); |
| 11866 | Vdouble_click_time = make_number (500); | 11867 | Vdouble_click_time = make_number (500); |
| 11867 | 11868 | ||
| 11868 | DEFVAR_INT ("double-click-fuzz", double_click_fuzz, | 11869 | DEFVAR_INT ("double-click-fuzz", double_click_fuzz, |
| 11869 | doc: /* *Maximum mouse movement between clicks to make a double-click. | 11870 | doc: /* Maximum mouse movement between clicks to make a double-click. |
| 11870 | On window-system frames, value is the number of pixels the mouse may have | 11871 | On window-system frames, value is the number of pixels the mouse may have |
| 11871 | moved horizontally or vertically between two clicks to make a double-click. | 11872 | moved horizontally or vertically between two clicks to make a double-click. |
| 11872 | On non window-system frames, value is interpreted in units of 1/8 characters | 11873 | On non window-system frames, value is interpreted in units of 1/8 characters |
| @@ -11877,7 +11878,7 @@ to count as a drag. */); | |||
| 11877 | double_click_fuzz = 3; | 11878 | double_click_fuzz = 3; |
| 11878 | 11879 | ||
| 11879 | DEFVAR_BOOL ("inhibit-local-menu-bar-menus", inhibit_local_menu_bar_menus, | 11880 | DEFVAR_BOOL ("inhibit-local-menu-bar-menus", inhibit_local_menu_bar_menus, |
| 11880 | doc: /* *Non-nil means inhibit local map menu bar menus. */); | 11881 | doc: /* Non-nil means inhibit local map menu bar menus. */); |
| 11881 | inhibit_local_menu_bar_menus = 0; | 11882 | inhibit_local_menu_bar_menus = 0; |
| 11882 | 11883 | ||
| 11883 | DEFVAR_INT ("num-input-keys", num_input_keys, | 11884 | DEFVAR_INT ("num-input-keys", num_input_keys, |
| @@ -12052,7 +12053,7 @@ and the minor mode maps regardless of `overriding-local-map'. */); | |||
| 12052 | Vspecial_event_map = Fcons (intern_c_string ("keymap"), Qnil); | 12053 | Vspecial_event_map = Fcons (intern_c_string ("keymap"), Qnil); |
| 12053 | 12054 | ||
| 12054 | DEFVAR_LISP ("track-mouse", do_mouse_tracking, | 12055 | DEFVAR_LISP ("track-mouse", do_mouse_tracking, |
| 12055 | doc: /* *Non-nil means generate motion events for mouse motion. */); | 12056 | doc: /* Non-nil means generate motion events for mouse motion. */); |
| 12056 | 12057 | ||
| 12057 | DEFVAR_KBOARD ("system-key-alist", Vsystem_key_alist, | 12058 | DEFVAR_KBOARD ("system-key-alist", Vsystem_key_alist, |
| 12058 | doc: /* Alist of system-specific X windows key symbols. | 12059 | doc: /* Alist of system-specific X windows key symbols. |
| @@ -12146,7 +12147,7 @@ immediately after running `post-command-hook'. */); | |||
| 12146 | Vdelayed_warnings_list = Qnil; | 12147 | Vdelayed_warnings_list = Qnil; |
| 12147 | 12148 | ||
| 12148 | DEFVAR_LISP ("suggest-key-bindings", Vsuggest_key_bindings, | 12149 | DEFVAR_LISP ("suggest-key-bindings", Vsuggest_key_bindings, |
| 12149 | doc: /* *Non-nil means show the equivalent key-binding when M-x command has one. | 12150 | doc: /* Non-nil means show the equivalent key-binding when M-x command has one. |
| 12150 | The value can be a length of time to show the message for. | 12151 | The value can be a length of time to show the message for. |
| 12151 | If the value is non-nil and not a number, we wait 2 seconds. */); | 12152 | If the value is non-nil and not a number, we wait 2 seconds. */); |
| 12152 | Vsuggest_key_bindings = Qt; | 12153 | Vsuggest_key_bindings = Qt; |
| @@ -12206,7 +12207,7 @@ just after executing the command. */); | |||
| 12206 | 12207 | ||
| 12207 | DEFVAR_LISP ("global-disable-point-adjustment", | 12208 | DEFVAR_LISP ("global-disable-point-adjustment", |
| 12208 | Vglobal_disable_point_adjustment, | 12209 | Vglobal_disable_point_adjustment, |
| 12209 | doc: /* *If non-nil, always suppress point adjustment. | 12210 | doc: /* If non-nil, always suppress point adjustment. |
| 12210 | 12211 | ||
| 12211 | The default value is nil, in which case, point adjustment are | 12212 | The default value is nil, in which case, point adjustment are |
| 12212 | suppressed only after special commands that set | 12213 | suppressed only after special commands that set |
| @@ -12214,7 +12215,7 @@ suppressed only after special commands that set | |||
| 12214 | Vglobal_disable_point_adjustment = Qnil; | 12215 | Vglobal_disable_point_adjustment = Qnil; |
| 12215 | 12216 | ||
| 12216 | DEFVAR_LISP ("minibuffer-message-timeout", Vminibuffer_message_timeout, | 12217 | DEFVAR_LISP ("minibuffer-message-timeout", Vminibuffer_message_timeout, |
| 12217 | doc: /* *How long to display an echo-area message when the minibuffer is active. | 12218 | doc: /* How long to display an echo-area message when the minibuffer is active. |
| 12218 | If the value is not a number, such messages don't time out. */); | 12219 | If the value is not a number, such messages don't time out. */); |
| 12219 | Vminibuffer_message_timeout = make_number (2); | 12220 | Vminibuffer_message_timeout = make_number (2); |
| 12220 | 12221 | ||