Mercurial > emacs

--- a/doc/emacs/ChangeLog	Fri May 02 07:12:59 2008 +0000
+++ b/doc/emacs/ChangeLog	Fri May 02 07:20:33 2008 +0000
@@ -1,3 +1,8 @@
+2008-05-02  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+	* emacs/buffers.texi, emacs/files.texi (Version-control):
+	vc-toggle-read-only is no longer a good idea...
+
 2008-04-29  Glenn Morris  <rgm@gnu.org>

 	* cal-xtra.texi (Sexp Diary Entries): Clarify diary-float.
--- a/doc/emacs/buffers.texi	Fri May 02 07:12:59 2008 +0000
+++ b/doc/emacs/buffers.texi	Fri May 02 07:20:33 2008 +0000
@@ -239,9 +239,8 @@
 value in each buffer and makes the buffer read-only if its value is
 non-@code{nil}.  If you have files under version control, you may find
 it convenient to bind @kbd{C-x C-q} to @code{vc-toggle-read-only}
-instead.  Then, typing @kbd{C-x C-q} not only changes the read-only
-flag, but it also checks the file in or out.  @xref{Version
-Control}.
+instead.  This will guard you against an operation that will confuse
+most modern version-conmtrol systems. @xref{Version Control}.

 @findex rename-buffer
   @kbd{M-x rename-buffer} changes the name of the current buffer.  You
--- a/doc/emacs/files.texi	Fri May 02 07:12:59 2008 +0000
+++ b/doc/emacs/files.texi	Fri May 02 07:20:33 2008 +0000
@@ -1664,15 +1664,6 @@
 merging but can be configured to do locking.  Later systems such as
 GNU Arch and Mercurial always use merging.

-@findex vc-toggle-read-only
-@kindex C-x C-q @r{(Version Control)}
-  As a special convenience that is particularly useful for files with
-locking, you can let Emacs check a file in or out whenever you change
-its read-only flag.  This means, for example, that you cannot
-accidentally edit a file without properly checking it out first.  To
-achieve this, bind the key @kbd{C-x C-q} to @kbd{vc-toggle-read-only}
-in your @file{~/.emacs} file.  (@xref{Init Rebinding}.)
-
 @node VC With A Locking VCS
 @subsubsection Basic Version Control with Locking