* lisp/descr-text.el (describe-char-unicode-data): Fix copy/paste errors.

[gnu-emacs] / lisp / master.el

diff --git a/lisp/master.el b/lisp/master.el
index 1ea0a24ca948ac6eafdd7c57076d0abe4a722b80..b7c41e828ab9eb43e846e23c1a988c32ac2e061a 100644 (file)
--- 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-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
@@ -53,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.
 
@@ -72,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)