X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/06d8ace51597cd41e110560a56a1abeb6cce23d6..06b605171f1c9d8b42bd3326a243b8b03d2e4e58:/lisp/mouse-drag.el diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el index 51f4612d68..1f16b9935c 100644 --- a/lisp/mouse-drag.el +++ b/lisp/mouse-drag.el @@ -1,7 +1,6 @@ ;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling -;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2001-2011 Free Software Foundation, Inc. ;; Author: John Heidemann ;; Keywords: mouse @@ -215,13 +214,10 @@ To test this function, evaluate: (start-row (cdr (posn-col-row start-posn))) (start-col (car (posn-col-row start-posn))) (old-selected-window (selected-window)) - event end row mouse-delta scroll-delta + event end row scroll-delta have-scrolled - window-last-row - col mouse-col-delta window-last-col + col (scroll-col-delta 0) - adjusted-mouse-col-delta - adjusted-mouse-delta ;; be conservative about allowing horizontal scrolling (col-scrolling-p (mouse-drag-should-do-col-scrolling))) (select-window start-window) @@ -276,10 +272,10 @@ To test this function, evaluate: (start-row (cdr (posn-col-row start-posn))) (start-col (car (posn-col-row start-posn))) (old-selected-window (selected-window)) - event end row mouse-delta scroll-delta + event end row scroll-delta have-scrolled window-last-row - col mouse-col-delta window-last-col + col window-last-col (scroll-col-delta 0) ;; be conservative about allowing horizontal scrolling (col-scrolling-p (mouse-drag-should-do-col-scrolling)))