Merge changes from emacs-23

[bpt/emacs.git] / lisp / mwheel.el

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 224920e..4ead168 100644 (file)
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -1,9 +1,9 @@
 ;;; mwheel.el --- Wheel mouse support
 
-;; Copyright (C) 1998, 2000, 2001, 2002, 2002, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2011  Free Software Foundation, Inc.
 ;; Maintainer: William M. Perry <wmperry@gnu.org>
 ;; Keywords: mouse
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -247,7 +247,6 @@ This should only be bound to mouse buttons 4 and 5."
                          'mwheel-inhibit-click-timeout))))
 
 (put 'mwheel-scroll 'scroll-command t)
-(put 'mwheel-scroll 'isearch-scroll t)
 
 (defvar mwheel-installed-bindings nil)
 
@@ -285,5 +284,4 @@ Return non-nil if the new state is enabled."
 
 (provide 'mwheel)
 
-;; arch-tag: 50ed00e7-3686-4b7a-8037-fb31aa5c237f
 ;;; mwheel.el ends here