summaryrefslogtreecommitdiff
path: root/lisp/mouse.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-06-01 17:18:22 -0700
committerGlenn Morris <rgm@gnu.org>2014-06-01 17:18:22 -0700
commit953e106ac84587e765244995687b088969b5f6e1 (patch)
treea4d54b892e04b9123bc79ecffd69310f5807399e /lisp/mouse.el
parenteed652d649d28e9dafdb01f9c7425d7d28899e0d (diff)
parentafca0e759015ebc753b0c343ac45ac476dd31e9d (diff)
downloademacs-953e106ac84587e765244995687b088969b5f6e1.tar.gz
Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru
Diffstat (limited to 'lisp/mouse.el')
-rw-r--r--lisp/mouse.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el
index d1ab6c24565..10358c91636 100644
--- 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)))