(echo-area-clear-hook): Undo Oct 29 change.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 623dd1516dd..4557b596dd7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -437,7 +437,7 @@ Lisp_Object Vdeactivate_mark;
 Lisp_Object Vlucid_menu_bar_dirty_flag;
 Lisp_Object Qrecompute_lucid_menubar, Qactivate_menubar_hook;
 
-Lisp_Object Qecho_area_clear_hook, Vecho_area_clear_hook;
+Lisp_Object Qecho_area_clear_hook;
 
 /* Hooks to run before and after each command.  */
 Lisp_Object Qpre_command_hook, Vpre_command_hook;
@@ -10282,9 +10282,6 @@ syms_of_keyboard ()
   Qpost_command_idle_hook = intern ("post-command-idle-hook");
   staticpro (&Qpost_command_idle_hook);
 
-  Qecho_area_clear_hook = intern ("echo-area-clear-hook");
-  staticpro (&Qecho_area_clear_hook);
-
   Qdeferred_action_function = intern ("deferred-action-function");
   staticpro (&Qdeferred_action_function);
 
@@ -10724,9 +10721,12 @@ This feature is obsolete; use idle timers instead.  See `etc/NEWS'.  */);
 This is measured in microseconds.  */);
   post_command_idle_delay = 100000;
 
-  DEFVAR_LISP ("echo-area-clear-hook", &Vecho_area_clear_hook,
+#if 0
+  DEFVAR_LISP ("echo-area-clear-hook", ...,
                doc: /* Normal hook run when clearing the echo area.  */);
-  Vecho_area_clear_hook = Qnil;
+#endif
+  Qecho_area_clear_hook = intern ("echo-area-clear-hook");
+  SET_SYMBOL_VALUE (Qecho_area_clear_hook, Qnil);
 
   DEFVAR_LISP ("lucid-menu-bar-dirty-flag", &Vlucid_menu_bar_dirty_flag,
                doc: /* Non-nil means menu bar, specified Lucid style, needs to be recomputed.  */);