* vc/vc.el (vc-merge): Fix a prompt.

[gnu-emacs] / lisp / mouse-drag.el

diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 51f4612d689944c6561722daa43e77f79f72203b..17591ef12dd844b573019b0b35a6f369e6334537 100644 (file)
--- 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
 
 ;;; 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-2012  Free Software Foundation, Inc.

 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse


@@ -195,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
 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\"
 mouse-2 used to do, so we pass it through.
 
 Throw scrolling was inspired (but is not identical to) the \"hand\"


@@ -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))
         (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
         have-scrolled

-        window-last-row
-        col mouse-col-delta window-last-col
+        col

         (scroll-col-delta 0)
         (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)
         ;; 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))
         (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
         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)))
         (scroll-col-delta 0)
         ;; be conservative about allowing horizontal scrolling
         (col-scrolling-p (mouse-drag-should-do-col-scrolling)))