aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFred Pierresteguy1994-01-26 17:35:31 +0000
committerFred Pierresteguy1994-01-26 17:35:31 +0000
commit78614721380456edb71ba1c6d4d4a161a1bd758d (patch)
tree58029731f11d4492d7640d644f74b8bb88ff2841 /src
parent028922cf6acc7bea74e082b6924190a531922046 (diff)
downloademacs-78614721380456edb71ba1c6d4d4a161a1bd758d.tar.gz
emacs-78614721380456edb71ba1c6d4d4a161a1bd758d.zip
Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu)
* xdisp.c (update_menu_bar): Add USE_X_TOOLKIT conditional and test FRAME_EXTERNAL_MENU_BAR.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index c2a492ecbc0..2dbbbabb0d0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -946,7 +946,11 @@ update_menu_bar (window, just_this_one)
946 946
947 /* When we reach a frame's selected window, redo the frame's menu bar. */ 947 /* When we reach a frame's selected window, redo the frame's menu bar. */
948 if (!NILP (w->update_mode_line) 948 if (!NILP (w->update_mode_line)
949#ifdef USE_X_TOOLKIT
950 && FRAME_EXTERNAL_MENU_BAR (f)
951#else
949 && FRAME_MENU_BAR_LINES (f) > 0 952 && FRAME_MENU_BAR_LINES (f) > 0
953#endif
950 && EQ (FRAME_SELECTED_WINDOW (f), window)) 954 && EQ (FRAME_SELECTED_WINDOW (f), window))
951 { 955 {
952 /* If the user has switched buffers or windows, we need to 956 /* If the user has switched buffers or windows, we need to