Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru

[gnu-emacs] / lisp / mouse.el

diff --git a/lisp/mouse.el b/lisp/mouse.el
index d1ab6c24565ce6e6aad9ca0b1ecdc52b2c790c89..10358c916361c2b21e6bb137365cbd7078933835 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -684,7 +684,10 @@ its value is returned."
            (str (posn-string pos)))
        (or (and str
                 (get-text-property (cdr str) property (car str)))
-           (and pt
+            ;; FIXME: mouse clicks on the mode-line come with a position in
+            ;; (nth 5).  Maybe we should change the C code instead so that
+            ;; mouse-clicks don't include a position there!
+           (and pt (not (memq (posn-area pos) '(mode-line header-line)))
                 (get-char-property pt property w))))
     (get-char-property pos property)))