Fix mouse-posn-property

* doc/lispref/commands.texi (Click Events): Mention menu-bar.
* lisp/mouse.el (mouse-event-areas-with-no-buffer-positions):
New defvar including all areas mentioned in the Lisp reference.
(mouse-posn-property): Use it.

(cherry picked from commit b105089715c8b5d467282513965035faf955a5e3)

diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index d2e32ff7196df3d984463e40f8165a8a70b9bcc4..4f015467f746ed464ca9a0596828ab2ca807ed17 100644 (file)
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -1673,8 +1673,8 @@ The buffer position of the character clicked on in the text area; or,
 if the event was outside the text area, the window area where it
 occurred.  It is one of the symbols @code{mode-line},
 @code{header-line}, @code{tab-line}, @code{vertical-line},
-@code{left-margin}, @code{right-margin}, @code{left-fringe}, or
-@code{right-fringe}.
+@code{left-margin}, @code{right-margin}, @code{left-fringe},
+@code{right-fringe}, @code{tab-bar}, or @code{menu-bar}.
 
 In one special case, @var{pos-or-area} is a list containing a symbol
 (one of the symbols listed above) instead of just the symbol.  This

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 03dfc03341c07a0e9770949bf41677b9af412117..2fcbe856b89a0556610ab7745e51ae5017750caa 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1638,6 +1638,18 @@ is dragged over to."
 ;; operation.
 (put 'mouse-drag-region 'undo-inhibit-region t)
 
+(defvar mouse-event-areas-with-no-buffer-positions
+  '( mode-line header-line vertical-line
+     left-fringe right-fringe
+     left-margin right-margin
+     tab-bar menu-bar
+     tab-line)
+  "Event areas not containing buffer positions.
+Example: mouse clicks in the fringe come with a position in
+(nth 5).  This is useful but is not where we clicked, so
+don't look up that position's properties!.  Likewise for
+the other event areas.")
+
 (defun mouse-posn-property (pos property)
   "Look for a property at click position.
 POS may be either a buffer position or a click position like
@@ -1646,7 +1658,9 @@ a string, the text property PROPERTY is examined.
 If this is nil or the click is not on a string, then
 the corresponding buffer position is searched for PROPERTY.
 If PROPERTY is encountered in one of those places,
-its value is returned."
+its value is returned.  Mouse events in areas listed in
+`mouse-event-areas-with-no-buffer-positions' always return nil
+because such events do not contain buffer positions."
   (if (consp pos)
       (let ((w (posn-window pos)) (pt (posn-point pos))
            (str (posn-string pos)))
@@ -1657,12 +1671,9 @@ its value is returned."
        (or (and str
                  (< (cdr str) (length (car str)))
                 (get-text-property (cdr str) property (car str)))
-            ;; Mouse clicks in the fringe come with a position in
-            ;; (nth 5).  This is useful but is not exactly where we clicked, so
-            ;; don't look up that position's properties!
-            (and pt (not (memq (posn-area pos)
-                               '(left-fringe right-fringe
-                                 left-margin right-margin tab-bar)))
+            (and pt
+                 (not (memq (posn-area pos)
+                            mouse-event-areas-with-no-buffer-positions))
                  (get-char-property pt property w))))
     (get-char-property pos property)))