X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/341dd15a7bd9d0b4adff846e94289b3e1877eed1..22bcf2046977620a7f37bbd4dff4be4a4fffc0ed:/lisp/scroll-all.el

diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index 0658f40cc6..81a4d2c86e 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -1,17 +1,16 @@
 ;;; scroll-all.el --- scroll all buffers together minor mode
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2011 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <Gary.Foster@corp.sun.com>
 ;; Keywords: scroll crisp brief lock
 
 ;; 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:
 ;;    This mode allows multiple buffers to be 'locked' so that scrolling
@@ -92,9 +89,9 @@
 	 (call-interactively 'scroll-all-scroll-down-all))
 	((eq this-command 'previous-line)
 	 (call-interactively 'scroll-all-scroll-up-all))
-	((eq this-command 'scroll-up)
+	((memq this-command '(scroll-up scroll-up-command))
 	 (call-interactively 'scroll-all-page-down-all))
-	((eq this-command 'scroll-down)
+	((memq this-command '(scroll-down scroll-down-command))
 	 (call-interactively 'scroll-all-page-up-all))
 	((eq this-command 'beginning-of-buffer)
 	 (call-interactively 'scroll-all-beginning-of-buffer-all))
@@ -104,10 +101,13 @@
 
 ;;;###autoload
 (define-minor-mode scroll-all-mode
-  "Toggle Scroll-All minor mode.
-With ARG, turn Scroll-All minor mode on if ARG is positive, off otherwise.
-When Scroll-All mode is on, scrolling commands entered in one window
-apply to all visible windows in the same frame."
+  "Toggle shared scrolling in same-frame windows (Scroll-All mode).
+With a prefix argument ARG, enable Scroll-All mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil.
+
+When Scroll-All mode is enabled, scrolling commands invoked in
+one window apply to all visible windows in the same frame."
   nil " *SL*" nil
   :global t
   :group 'windows
@@ -118,5 +118,4 @@ apply to all visible windows in the same frame."
 
 (provide 'scroll-all)
 
-;; arch-tag: db20089a-b157-45df-b5d4-2430e60acdd8
 ;;; scroll-all.el ends here