diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-08-10 10:47:12 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-08-10 10:47:12 -0400 |
| commit | e18941095a56075d6eb908a65aafcd1697fea2ae (patch) | |
| tree | 8d19e753be6174e4b2195391898bca167ebdbdae /lisp/term/x-win.el | |
| parent | a3095f422d5a1ba89b7e5f0c3a8826cb9195fb36 (diff) | |
| download | emacs-e18941095a56075d6eb908a65aafcd1697fea2ae.tar.gz | |
* lisp/term/x-win.el (x-menu-bar-open): Always pass last-nonmenu-event.
* lisp/subr.el (eventp): `nil' is not an event, and eventp is not hot.
(event-start, event-end): Use posn-at-point to return a more
informative posn.
(posnp): New function.
* lisp/mouse.el (popup-menu-normalize-position): Use it.
Diffstat (limited to 'lisp/term/x-win.el')
| -rw-r--r-- | lisp/term/x-win.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 3f58614eb64..9b7254cd132 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1306,17 +1306,14 @@ Request data types in the order specified by `x-select-request-type'." (defun x-menu-bar-open (&optional frame) "Open the menu bar if it is shown. -`popup-menu' is used if it is off " +`popup-menu' is used if it is off." (interactive "i") (cond ((and (not (zerop (or (frame-parameter nil 'menu-bar-lines) 0))) (fboundp 'accelerate-menu)) (accelerate-menu frame)) (t - (popup-menu (mouse-menu-bar-map) - (if (listp last-nonmenu-event) - nil - (posn-at-point)))))) + (popup-menu (mouse-menu-bar-map) last-nonmenu-event)))) ;;; Window system initialization. |