diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
| commit | 2aa6b47e3e216410195cf7ec3abb5902f38082fa (patch) | |
| tree | 1b993c346dd4b6e92df488e1228411a6c737fef0 /lisp/mouse.el | |
| parent | 5bc3263303bde93db32b0799ecee0cfa9fe40e9a (diff) | |
| parent | 6e3adf8a4a796cea4328a528da48fc972b3feed6 (diff) | |
| download | emacs-2aa6b47e3e216410195cf7ec3abb5902f38082fa.tar.gz | |
Merge from origin/emacs-25
6e3adf8 Fix crash in syntax.c after GC
973ce5a Improve squiggly heredoc support in non-SMIE Ruby mode
9d5cceb Fix doc string quoting
0b33a23 Fix mouse dragging of vertical dividers with scroll bars on l...
a5d05f4 * etc/PROBLEMS: Mention the link-time problems on FreeBSD 11.
Diffstat (limited to 'lisp/mouse.el')
| -rw-r--r-- | lisp/mouse.el | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index 3e3708a2e0d..0be17b48cac 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -415,7 +415,15 @@ must be one of the symbols `header', `mode', or `vertical'." (or (not resize-mini-windows) (eq minibuffer-window (active-minibuffer-window))))))) - (setq draggable nil)))) + (setq draggable nil))) + ((eq line 'vertical) + (let ((divider-width (frame-right-divider-width frame))) + (when (and (or (not (numberp divider-width)) + (zerop divider-width)) + (eq (cdr (assq 'vertical-scroll-bars + (frame-parameters frame))) + 'left)) + (setq window (window-in-direction 'left window t)))))) (let* ((exitfun nil) (move |