HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge trunk
[bpt/emacs.git]
/
lisp
/
master.el
diff --git
a/lisp/master.el
b/lisp/master.el
index
5633314
..
b23c449
100644
(file)
--- a/
lisp/master.el
+++ b/
lisp/master.el
@@
-1,7
+1,6
@@
;;; master.el --- make a buffer the master over another buffer
;;; master.el --- make a buffer the master over another buffer
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: Alex Schroeder <alex@gnu.org>
;; Author: Alex Schroeder <alex@gnu.org>
;; Maintainer: Alex Schroeder <alex@gnu.org>
@@
-10,10
+9,10
@@
;; This file is part of GNU Emacs.
;; 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
;; 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-21,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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:
;;; Commentary:
@@
-75,12
+72,12
@@
You can set this variable using `master-set-slave'.")
;;;###autoload
(define-minor-mode master-mode
"Toggle Master mode.
;;;###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}
\\{master-mode-map}
@@
-161,5
+158,4
@@
See `recenter'."
(provide 'master)
(provide 'master)
-;; arch-tag: dca08daa-8127-45ae-b77e-b135160dce98
;;; master.el ends here
;;; master.el ends here