aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2013-08-16 11:44:32 +0200
committerMartin Rudalics2013-08-16 11:44:32 +0200
commit3dfc5cd613bccbc6027ab79ca3aa2218cbe0ab63 (patch)
treef07497d112100687b79db76e04afa058ed760aa0
parent907699465f53525f28c3cbdc55cebcc421e0295c (diff)
downloademacs-3dfc5cd613bccbc6027ab79ca3aa2218cbe0ab63.tar.gz
emacs-3dfc5cd613bccbc6027ab79ca3aa2218cbe0ab63.zip
In mouse-autoselect-window-select do autoselect when mouse pointer is on margin.
* window.el (mouse-autoselect-window-select): Do autoselect when mouse pointer is on margin.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5edb462adb5..11b465ba991 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-08-16 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (mouse-autoselect-window-select): Do autoselect when
4 mouse pointer is on margin.
5
12013-08-16 William Parsons <wbparsons@alum.mit.edu> (tiny change) 62013-08-16 William Parsons <wbparsons@alum.mit.edu> (tiny change)
2 7
3 * net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV. (Bug#1972) 8 * net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV. (Bug#1972)
diff --git a/lisp/window.el b/lisp/window.el
index e58496f6265..64cf0a72110 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6680,8 +6680,10 @@ is active. This function is run by `mouse-autoselect-window-timer'."
6680 (cond 6680 (cond
6681 ((or (menu-or-popup-active-p) 6681 ((or (menu-or-popup-active-p)
6682 (and window 6682 (and window
6683 (not (consp (coordinates-in-window-p 6683 (let ((coords (coordinates-in-window-p
6684 (cdr mouse-position) window))))) 6684 (cdr mouse-position) window)))
6685 (and (not (consp coords))
6686 (not (memq coords '(left-margin right-margin)))))))
6685 ;; A menu / popup dialog is active or the mouse is not on the 6687 ;; A menu / popup dialog is active or the mouse is not on the
6686 ;; text region of WINDOW: Suspend autoselection temporarily. 6688 ;; text region of WINDOW: Suspend autoselection temporarily.
6687 (mouse-autoselect-window-start mouse-position nil t)) 6689 (mouse-autoselect-window-start mouse-position nil t))