Use auto-hscroll-mode rather than the alias automatic-hscrolling

* lisp/mouse.el (mouse-drag-track):
* lisp/speedbar.el (speedbar-frame-mode):
Use auto-hscroll-mode rather than the alias automatic-hscrolling.

3 files changed, 12 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 280bfe769a2..599a69bb9c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-17  Glenn Morris  <rgm@gnu.org>
+
+        * mouse.el (mouse-drag-track):
+        * speedbar.el (speedbar-frame-mode):
+        Use auto-hscroll-mode rather than the alias automatic-hscrolling.
+
 2012-04-16  Leo Liu  <sdl.web@gmail.com>
 
         * progmodes/python.el: Trivial cleanup.
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 2e119483797..3344bbec2cc 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1,6 +1,6 @@
 ;;; mouse.el --- window system-independent mouse support
 
-;; Copyright (C) 1993-1995, 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1999-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: hardware, mouse
@@ -805,8 +805,8 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
                                   (= click-count 1)))
          ;; Suppress automatic hscrolling, because that is a nuisance
          ;; when setting point near the right fringe (but see below).
-         (automatic-hscrolling-saved automatic-hscrolling)
-         (automatic-hscrolling nil)
+         (auto-hscroll-mode-saved auto-hscroll-mode)
+         (auto-hscroll-mode nil)
          event end end-point)
 
     (setq mouse-selection-click-count click-count)
@@ -838,7 +838,7 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
           ;; Automatic hscrolling did not occur during the call to
           ;; `read-event'; but if the user subsequently drags the
           ;; mouse, go ahead and hscroll.
-          (let ((automatic-hscrolling automatic-hscrolling-saved))
+          (let ((auto-hscroll-mode auto-hscroll-mode-saved))
             (redisplay))
           (setq end (event-end event)
                 end-point (posn-point end))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index bb1debb4552..9065d9ed131 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1,6 +1,6 @@
 ;;; speedbar --- quick access to files and tags in a frame
 
-;; Copyright (C) 1996-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
@@ -1022,7 +1022,7 @@ supported at a time.
   (set (make-local-variable 'dframe-delete-frame-function)
        'speedbar-handle-delete-frame)
   ;; hscroll
-  (set (make-local-variable 'automatic-hscrolling) nil) ; Emacs 21
+  (set (make-local-variable 'auto-hscroll-mode) nil)
   ;; reset the selection variable
   (setq speedbar-last-selected-file nil))