aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2013-03-18 18:19:24 +0100
committerJan Djärv2013-03-18 18:19:24 +0100
commite477dbfa64d70307f0221f7bb7abb8dabd5aad50 (patch)
tree6ab541285feeaa3f4035cdda47665928dd91840f
parente9b4dbdcaa3b83a805581fc81084ef2395e44c0b (diff)
downloademacs-e477dbfa64d70307f0221f7bb7abb8dabd5aad50.tar.gz
emacs-e477dbfa64d70307f0221f7bb7abb8dabd5aad50.zip
* mouse.el (mouse-on-link-p): Check for scroll bar.
Fixes: debbugs:13979
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mouse.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd1cbbcf5bb..c3dc0bfaa87 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-03-18 Jan Djärv <jan.h.d@swipnet.se>
2
3 * mouse.el (mouse-on-link-p): Check for scroll bar (Bug#13979).
4
12013-03-18 Michael Albinus <michael.albinus@gmx.de> 52013-03-18 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * net/tramp-compat.el (tramp-compat-user-error): New defun. 7 * net/tramp-compat.el (tramp-compat-user-error): New defun.
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 51601bca8df..ea6b1b04de0 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -755,7 +755,8 @@ click is the local or global binding of that event.
755- Otherwise, the mouse-1 event is translated into a mouse-2 event 755- Otherwise, the mouse-1 event is translated into a mouse-2 event
756at the same position." 756at the same position."
757 (let ((action 757 (let ((action
758 (and (or (not (consp pos)) 758 (and (not (memq 'vertical-scroll-bar pos))
759 (or (not (consp pos))
759 mouse-1-click-in-non-selected-windows 760 mouse-1-click-in-non-selected-windows
760 (eq (selected-window) (posn-window pos))) 761 (eq (selected-window) (posn-window pos)))
761 (or (mouse-posn-property pos 'follow-link) 762 (or (mouse-posn-property pos 'follow-link)