X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/09d9db2c4921cb2eb0974892164dd03d6bffdd80..c4dd9efc9ed3f7de8f4ee74b6d47f65ad72320cf:/lisp/mouse-drag.el diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el index ac99a34e64..3a29e05c8b 100644 --- a/lisp/mouse-drag.el +++ b/lisp/mouse-drag.el @@ -1,6 +1,6 @@ ;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling -;; Copyright (C) 1996-1997, 2001-2011 Free Software Foundation, Inc. +;; Copyright (C) 1996-1997, 2001-2013 Free Software Foundation, Inc. ;; Author: John Heidemann ;; Keywords: mouse @@ -46,7 +46,7 @@ ;; If you like mouse-drag, you should also check out mouse-copy ;; for ``one-click text copy and move''. ;; -;; To use mouse-drag, place the following in your .emacs file: +;; To use mouse-drag, place the following in your init file: ;; -either- ;; (global-set-key [down-mouse-2] 'mouse-drag-throw) ;; -or- @@ -169,7 +169,7 @@ Basically, we check for existing horizontal scrolling." nil)))))) (defvar mouse-throw-with-scroll-bar nil - "*Set direction of mouse-throwing. + "Set direction of mouse-throwing. If nil, the text moves in the direction the mouse moves. If t, the scroll bar moves in the direction the mouse moves.") (defconst mouse-throw-magnifier-min -6) @@ -194,7 +194,7 @@ from the original mouse click to the current mouse location. Try it; you'll like it. It's easier to observe than to explain. If the mouse is clicked and released in the same place of time we -assume that the user didn't want to scdebugroll but wanted to whatever +assume that the user didn't want to scroll but wanted to whatever mouse-2 used to do, so we pass it through. Throw scrolling was inspired (but is not identical to) the \"hand\" @@ -214,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) @@ -275,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)))