Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.

[gnu-emacs] / lisp / scroll-lock.el

diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index a6d8e612d0b3810beb0dfa7d99eb364f62d0f417..0fe39c2ac3ef2dc07961f5fba92e7fbf2511ed46 100644 (file)
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -1,6 +1,6 @@
 ;;; scroll-lock.el --- Scroll lock scrolling.
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: FSF
@@ -123,5 +123,4 @@ during scrolling."
 
 (provide 'scroll-lock)
 
-;; arch-tag: 148fc8e8-67e0-4638-bb34-3291595ab7e1
 ;;; scroll-lock.el ends here