aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorJuri Linkov2019-10-01 23:15:03 +0300
committerJuri Linkov2019-10-01 23:15:03 +0300
commit2698d3dba2e9858b026ed127d4de3f86810a5ef3 (patch)
tree8e9b8f194cfcad8af83a4174a0105bbc691f06d6 /src/menu.c
parent25f45d710e91a7c1049f056ff27bc3e6968f5624 (diff)
parent3f981a0a89bca47a207fb362485f07e7322bb145 (diff)
downloademacs-2698d3dba2e9858b026ed127d4de3f86810a5ef3.tar.gz
emacs-2698d3dba2e9858b026ed127d4de3f86810a5ef3.zip
Merge branch 'feature/tabs'
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/menu.c b/src/menu.c
index f67bdf05667..3d9cdb02115 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1130,6 +1130,7 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu)
1130 /* Decode the first argument: find the window and the coordinates. */ 1130 /* Decode the first argument: find the window and the coordinates. */
1131 if (EQ (position, Qt) 1131 if (EQ (position, Qt)
1132 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) 1132 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
1133 || EQ (XCAR (position), Qtab_bar)
1133 || EQ (XCAR (position), Qtool_bar)))) 1134 || EQ (XCAR (position), Qtool_bar))))
1134 { 1135 {
1135 get_current_pos_p = 1; 1136 get_current_pos_p = 1;
@@ -1506,6 +1507,7 @@ for instance using the window manager, then this produces a quit and
1506 /* Decode the first argument: find the window or frame to use. */ 1507 /* Decode the first argument: find the window or frame to use. */
1507 if (EQ (position, Qt) 1508 if (EQ (position, Qt)
1508 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) 1509 || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
1510 || EQ (XCAR (position), Qtab_bar)
1509 || EQ (XCAR (position), Qtool_bar)))) 1511 || EQ (XCAR (position), Qtool_bar))))
1510 window = selected_window; 1512 window = selected_window;
1511 else if (CONSP (position)) 1513 else if (CONSP (position))