From d46fb96ae4daab90cad40919340ab424fdde4c99 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Fri, 16 Jun 1995 05:36:08 +0000 Subject: [PATCH] (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. --- src/xdisp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 9f1353d2025..60a68c4943a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -48,7 +48,7 @@ extern Lisp_Object Qface; 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 @@ update_menu_bar (f, save_match_data) 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 @@ syms_of_xdisp () 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"); -- 2.39.2