summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-09-24 14:38:20 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-09-24 14:38:20 -0400
commit371d6a61466a2efe33a3d61a91cb8680b8db6277 (patch)
tree189a6fdf27b00d7e2eae1bd36f173bd180143c09
parentcddde9219f8ec1a47e0e967c117e269ecf9742e9 (diff)
downloademacs-371d6a61466a2efe33a3d61a91cb8680b8db6277.tar.gz
* mouse.el (mouse-drag-track): Set scroll-margin to 0 while tracking.
Fixes: debbugs:9541
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mouse.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf63cacf728..8b7e5f1525b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-24 Chong Yidong <cyd@stupidchicken.com>
+
+ * mouse.el (mouse-drag-track): Set scroll-margin to 0 while
+ tracking (Bug#9541).
+
2011-09-24 Ulf Jasper <ulf.jasper@web.de>
* net/newst-reader.el (newsticker-html-renderer)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 63395619f44..8a74782250d 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -904,7 +904,8 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
(mouse-minibuffer-check start-event)
(setq mouse-selection-click-count-buffer (current-buffer))
(deactivate-mark)
- (let* ((original-window (selected-window))
+ (let* ((scroll-margin 0) ; Avoid margin scrolling (Bug#9541).
+ (original-window (selected-window))
;; We've recorded what we needed from the current buffer and
;; window, now let's jump to the place of the event, where things
;; are happening.