diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2008-05-02 07:20:33 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2008-05-02 07:20:33 +0000 |
| commit | a31b405e933b6b4bcb6a384bef8849f89c140029 (patch) | |
| tree | 72510ab18028f62b213ca58b7afa42d06c05b80e /doc | |
| parent | 25e94278c3e592422f67404b75c9997a68f6b797 (diff) | |
| download | emacs-a31b405e933b6b4bcb6a384bef8849f89c140029.tar.gz | |
vc-toggle-read-only is no longer a good idea.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/buffers.texi | 5 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 9 |
3 files changed, 7 insertions, 12 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 14a25643dfe..5453df460d8 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -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. diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 0cb4f596d9c..4d8fa5ad51e 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -239,9 +239,8 @@ works by setting the variable @code{buffer-read-only}, which has a local 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 diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 1199573cc05..93883e847ee 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1664,15 +1664,6 @@ RCS normally use locking; CVS and Subversion normally use 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 |