aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/menu.c b/src/menu.c
index 9c08ff17665..468f2814eb4 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -415,7 +415,8 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
415 item_string = concat2 (prefix, item_string); 415 item_string = concat2 (prefix, item_string);
416 } 416 }
417 417
418 if (FRAME_TERMCAP_P (XFRAME (Vmenu_updating_frame)) 418 if ((FRAME_TERMCAP_P (XFRAME (Vmenu_updating_frame))
419 || FRAME_MSDOS_P (XFRAME (Vmenu_updating_frame)))
419 && !NILP (map)) 420 && !NILP (map))
420 /* Indicate visually that this is a submenu. */ 421 /* Indicate visually that this is a submenu. */
421 item_string = concat2 (item_string, build_string (" >")); 422 item_string = concat2 (item_string, build_string (" >"));
@@ -1442,6 +1443,7 @@ no quit occurs and `x-popup-menu' returns nil. */)
1442 keymaps, title, &error_name); 1443 keymaps, title, &error_name);
1443 else 1444 else
1444#endif 1445#endif
1446#ifndef MSDOS
1445 if (FRAME_TERMCAP_P (f)) 1447 if (FRAME_TERMCAP_P (f))
1446 { 1448 {
1447 ptrdiff_t count1 = SPECPDL_INDEX (); 1449 ptrdiff_t count1 = SPECPDL_INDEX ();
@@ -1453,6 +1455,7 @@ no quit occurs and `x-popup-menu' returns nil. */)
1453 kbd_menu_navigation, &error_name); 1455 kbd_menu_navigation, &error_name);
1454 unbind_to (count1, Qnil); 1456 unbind_to (count1, Qnil);
1455 } 1457 }
1458#endif
1456 1459
1457#ifdef HAVE_NS 1460#ifdef HAVE_NS
1458 unbind_to (specpdl_count, Qnil); 1461 unbind_to (specpdl_count, Qnil);