aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPavel Janík2001-10-29 17:53:18 +0000
committerPavel Janík2001-10-29 17:53:18 +0000
commit74e79967f5c5dfec288a3683c134d59485cbe357 (patch)
treed2734a12b0757638ffcaf8f42369ce42d36a435c /src
parentd90a41e8ba1711e207e80fb6f18182c2645a8601 (diff)
downloademacs-74e79967f5c5dfec288a3683c134d59485cbe357.tar.gz
emacs-74e79967f5c5dfec288a3683c134d59485cbe357.zip
(Finput_pending_p): Fix typo in doc-string.
(echo-area-clear-hook): Properly DEFVAR_LISP and staticpro it.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c14
2 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 924e28a18d0..3c8465320ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-10-29 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
2
3 * keyboard.c (Finput_pending_p): Fix typo in doc-string.
4 (echo-area-clear-hook): Properly DEFVAR_LISP and staticpro it.
5
12001-10-29 Gerd Moellmann <gerd@gnu.org> 62001-10-29 Gerd Moellmann <gerd@gnu.org>
2 7
3 * xterm.c (x_display_and_set_cursor): If cursor_in_echo_area, 8 * xterm.c (x_display_and_set_cursor): If cursor_in_echo_area,
diff --git a/src/keyboard.c b/src/keyboard.c
index 659a297b5a3..5f94a281536 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -437,7 +437,7 @@ Lisp_Object Vdeactivate_mark;
437Lisp_Object Vlucid_menu_bar_dirty_flag; 437Lisp_Object Vlucid_menu_bar_dirty_flag;
438Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook; 438Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook;
439 439
440Lisp_Object Qecho_area_clear_hook; 440Lisp_Object Qecho_area_clear_hook, Vecho_area_clear_hook;
441 441
442/* Hooks to run before and after each command. */ 442/* Hooks to run before and after each command. */
443Lisp_Object Qpre_command_hook, Vpre_command_hook; 443Lisp_Object Qpre_command_hook, Vpre_command_hook;
@@ -9489,7 +9489,7 @@ requeued_events_pending_p ()
9489 9489
9490 9490
9491DEFUN ("input-pending-p", Finput_pending_p, Sinput_pending_p, 0, 0, 0, 9491DEFUN ("input-pending-p", Finput_pending_p, Sinput_pending_p, 0, 0, 0,
9492 doc: /* T if command input is currently available with no waiting. 9492 doc: /* t if command input is currently available with no waiting.
9493Actually, the value is nil only if we can be sure that no input is available. */) 9493Actually, the value is nil only if we can be sure that no input is available. */)
9494 () 9494 ()
9495{ 9495{
@@ -10281,6 +10281,9 @@ syms_of_keyboard ()
10281 Qpost_command_idle_hook = intern ("post-command-idle-hook"); 10281 Qpost_command_idle_hook = intern ("post-command-idle-hook");
10282 staticpro (&Qpost_command_idle_hook); 10282 staticpro (&Qpost_command_idle_hook);
10283 10283
10284 Qecho_area_clear_hook = intern ("echo-area-clear-hook");
10285 staticpro (&Qecho_area_clear_hook);
10286
10284 Qdeferred_action_function = intern ("deferred-action-function"); 10287 Qdeferred_action_function = intern ("deferred-action-function");
10285 staticpro (&Qdeferred_action_function); 10288 staticpro (&Qdeferred_action_function);
10286 10289
@@ -10720,12 +10723,9 @@ This feature is obsolete; use idle timers instead. See `etc/NEWS'. */);
10720This is measured in microseconds. */); 10723This is measured in microseconds. */);
10721 post_command_idle_delay = 100000; 10724 post_command_idle_delay = 100000;
10722 10725
10723#if 0 10726 DEFVAR_LISP ("echo-area-clear-hook", &Vecho_area_clear_hook,
10724 DEFVAR_LISP ("echo-area-clear-hook", ...,
10725 doc: /* Normal hook run when clearing the echo area. */); 10727 doc: /* Normal hook run when clearing the echo area. */);
10726#endif 10728 Vecho_area_clear_hook = Qnil;
10727 Qecho_area_clear_hook = intern ("echo-area-clear-hook");
10728 SET_SYMBOL_VALUE (Qecho_area_clear_hook, Qnil);
10729 10729
10730 DEFVAR_LISP ("lucid-menu-bar-dirty-flag", &Vlucid_menu_bar_dirty_flag, 10730 DEFVAR_LISP ("lucid-menu-bar-dirty-flag", &Vlucid_menu_bar_dirty_flag,
10731 doc: /* t means menu bar, specified Lucid style, needs to be recomputed. */); 10731 doc: /* t means menu bar, specified Lucid style, needs to be recomputed. */);