1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/mouse.el b/lisp/mouse.el
index e1b7e51e6a1..8d3c775c7ec 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -922,7 +922,9 @@ selection through the word or line clicked on.  If you do this
 again in a different position, it extends the selection again.
 If you do this twice in the same position, the selection is killed." 
   (interactive "e")
-  (let ((before-scroll point-before-scroll))
+  (let ((before-scroll
+         (with-current-buffer (window-buffer (posn-window (event-start click)))
+           point-before-scroll)))
     (mouse-minibuffer-check click)
     (let ((click-posn (posn-point (event-start click)))
           ;; Don't let a subsequent kill command append to this one: