summaryrefslogtreecommitdiff
path: root/src/menu.c
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2021-09-09 10:52:41 +0300
committerJuri Linkov <juri@linkov.net>2021-09-09 10:52:41 +0300
commit14d5145441559bdbefd3a4188144217e01c033de (patch)
treee4096c08dde76a45a63286953465a343deb29ac3 /src/menu.c
parent8ac5510a0e0e545384d51366f45dedbe1edef656 (diff)
parent3a8b8df478f794560d83270d0f688e7bc00081c6 (diff)
downloademacs-14d5145441559bdbefd3a4188144217e01c033de.tar.gz
emacs-14d5145441559bdbefd3a4188144217e01c033de.tar.bz2
emacs-14d5145441559bdbefd3a4188144217e01c033de.zip
Merge branch 'feature/tab-bar-events'
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/menu.c b/src/menu.c
index d43360ec4ea..1aafa78c3ce 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1127,9 +1127,12 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu)
/* Decode the first argument: find the window and the coordinates. */
if (EQ (position, Qt)
- || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
- || EQ (XCAR (position), Qtab_bar)
- || EQ (XCAR (position), Qtool_bar))))
+ || (CONSP (position)
+ && (EQ (XCAR (position), Qmenu_bar)
+ || EQ (XCAR (position), Qtab_bar)
+ || (CONSP (XCDR (position))
+ && EQ (XCAR (XCDR (position)), Qtab_bar))
+ || EQ (XCAR (position), Qtool_bar))))
{
get_current_pos_p = 1;
}