summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/menu-bar.el6
-rw-r--r--lisp/xt-mouse.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index e42602364d2..f9afc8a5f31 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2672,6 +2672,12 @@ EVENT should be a mouse down or click event.
Also see `menu-bar-open', which this calls.
This command is to be used when you click the mouse in the menubar."
(interactive "e")
+ ;; This only should be bound to clicks on the menu-bar, outside of
+ ;; any window.
+ (let ((window (posn-window (event-start event))))
+ (when window
+ (error "Event is inside window %s" window)))
+
(let* ((x-position (car (posn-x-y (event-start event))))
(menu-bar-item-cons (menu-bar-item-at-x x-position)))
(menu-bar-open nil
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 3c0dfb65ecf..f9c08f9a174 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -267,7 +267,7 @@ which is the \"1006\" extension implemented in Xterm >= 277."
(eq y 1)))
'tab-bar
'menu-bar))
- (nthcdr 2 (posn-at-x-y x y)))))
+ (nthcdr 2 (posn-at-x-y x y (selected-frame))))))
(event (list type posn)))
(setcar (nthcdr 3 posn) timestamp)