lisp/*.el: Lexical-binding cleanup.

[bpt/emacs.git] / lisp / mouse-drag.el

diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 372c086..1f16b99 100644 (file)
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -1,17 +1,16 @@
 ;;; 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 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1997, 2001-2011  Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -50,8 +47,7 @@
 ;; for ``one-click text copy and move''.
 ;;
 ;; To use mouse-drag, place the following in your .emacs file:
-;;     (require 'mouse-drag)
-;; -and either-
+;; -either-
 ;;     (global-set-key [down-mouse-2] 'mouse-drag-throw)
 ;; -or-
 ;;     (global-set-key [down-mouse-2] 'mouse-drag-drag)
@@ -166,7 +162,7 @@ Basically, we check for existing horizontal scrolling."
        mouse-drag-electric-col-scrolling
        (save-excursion  ;; on a long line?
         (let
-            ((beg (progn (beginning-of-line) (point)))
+            ((beg (line-beginning-position))
              (end (progn (end-of-line) (point))))
           (if (> (- end beg) (window-width))
               (setq truncate-lines t)
@@ -189,7 +185,7 @@ If t, the scroll bar moves in the direction the mouse moves.")
      (if (< mouse-delta 0) -1 1)
      (if mouse-throw-with-scroll-bar 1 -1)))
 
-
+;;;###autoload
 (defun mouse-drag-throw (start-event)
   "\"Throw\" the page according to a mouse drag.
 
@@ -218,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)
@@ -256,6 +249,7 @@ To test this function, evaluate:
     ;; Now restore the old window.
     (select-window old-selected-window)))
 
+;;;###autoload
 (defun mouse-drag-drag (start-event)
   "\"Drag\" the page according to a mouse drag.
 
@@ -278,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)))
@@ -328,5 +322,4 @@ To test this function, evaluate:
 
 (provide 'mouse-drag)
 
-;; arch-tag: e47354ff-82f5-42c4-b3dc-88dd9c04b770
 ;;; mouse-drag.el ends here