X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/768d4533ce51d61ce065b28f63aae43c7be0d1cc..ba3189039adc8ec5eba5ed3e21d42019a4616b7c:/lisp/master.el

diff --git a/lisp/master.el b/lisp/master.el
index b9908e82b5..c4f4680041 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -1,6 +1,6 @@
 ;;; master.el --- make a buffer the master over another buffer
 
-;; Copyright (C) 1999, 2000, 2001, 2005  Alexander Schroeder
+;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
@@ -9,10 +9,10 @@
 
 ;; 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 2, 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
@@ -20,9 +20,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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -55,10 +53,11 @@
 
 ;;; Code:
 
-(defgroup master nil
-  "Support for master/slave relationships between buffers."
-  :version "22.1"
-  :group 'convenience)
+;; Unused.
+;;; (defgroup master nil
+;;;   "Support for master/slave relationships between buffers."
+;;;   :version "22.1"
+;;;   :group 'convenience)
 
 ;; Variables that don't need initialization.
 
@@ -74,19 +73,20 @@ You can set this variable using `master-set-slave'.")
 ;;;###autoload
 (define-minor-mode master-mode
   "Toggle Master mode.
-With no argument, this command toggles the mode.
-Non-null prefix argument turns on the mode.
-Null prefix argument turns off the mode.
+With a prefix argument ARG, enable Master mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil.
 
-When Master mode is enabled, you can scroll the slave buffer using the
-following commands:
+When Master mode is enabled, you can scroll the slave buffer
+using the following commands:
 
 \\{master-mode-map}
 
 The slave buffer is stored in the buffer-local variable `master-of'.
 You can set this variable using `master-set-slave'.  You can show
 yourself the value of `master-of' by calling `master-show-slave'."
-  :group 'master
+  ;; Not global, so no effect.
+;;;  :group 'master
   :keymap
   '(("\C-c\C-n" . master-says-scroll-up)
     ("\C-c\C-p" . master-says-scroll-down)
@@ -160,5 +160,4 @@ See `recenter'."
 
 (provide 'master)
 
-;;; arch-tag: dca08daa-8127-45ae-b77e-b135160dce98
 ;;; master.el ends here