changeset 12263:6ceecf7d1ec3

(Qoverriding_terminal_local_map): New variable. (syms_of_xdisp): staticpro it. (update_menu_bar): If we bind overriding-local-map, also bind overriding-terminal-local-map.
author Karl Heuer <kwzh@gnu.org>
date Fri, 16 Jun 1995 05:36:08 +0000
parents a7d5578ebb25
children 93010bff5b56
files src/xdisp.c
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Fri Jun 16 05:24:27 1995 +0000
+++ b/src/xdisp.c	Fri Jun 16 05:36:08 1995 +0000
@@ -48,7 +48,7 @@
 extern Lisp_Object Voverriding_local_map;
 extern Lisp_Object Voverriding_local_map_menu_flag;
 
-Lisp_Object Qoverriding_local_map;
+Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
 
 /* Nonzero means print newline to stdout before next minibuffer message.  */
 
@@ -1268,7 +1268,10 @@
 	  if (save_match_data)
 	    record_unwind_protect (Fstore_match_data, Fmatch_data ());
 	  if (NILP (Voverriding_local_map_menu_flag))
-	    specbind (Qoverriding_local_map, Qnil);
+	    {
+	      specbind (Qoverriding_terminal_local_map, Qnil);
+	      specbind (Qoverriding_local_map, Qnil);
+	    }
 
 	  /* Run the Lucid hook.  */
 	  call1 (Vrun_hooks, Qactivate_menubar_hook);
@@ -4057,6 +4060,9 @@
   staticpro (&Qmenu_bar_update_hook);
   Qmenu_bar_update_hook = intern ("menu-bar-update-hook");
 
+  staticpro (&Qoverriding_terminal_local_map);
+  Qoverriding_local_map = intern ("overriding-terminal-local-map");
+
   staticpro (&Qoverriding_local_map);
   Qoverriding_local_map = intern ("overriding-local-map");