aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-11-18 17:05:44 +0000
committerRichard M. Stallman2005-11-18 17:05:44 +0000
commitc5d36b039dfb513fc64d20f265717c841e98d0b2 (patch)
tree8b9b7b2eea9763000a3e650c469a951c82c113cc
parentcf6ac72b4bffdd1199aa14c1f7ccfcc301694cb9 (diff)
downloademacs-c5d36b039dfb513fc64d20f265717c841e98d0b2.tar.gz
emacs-c5d36b039dfb513fc64d20f265717c841e98d0b2.zip
(Registering): Mention @@ in mode line.
(Renaming and VC): Some back-ends don't handle renaming.
-rw-r--r--man/ChangeLog11
-rw-r--r--man/files.texi8
2 files changed, 18 insertions, 1 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 10e6e800ea3..7f284eb1f10 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,14 @@
12005-11-18 Richard M. Stallman <rms@gnu.org>
2
3 * files.texi (Registering): Mention @@ in mode line.
4
5 * mini.texi (Minibuffer File): Clarify previous change. Add @findex.
6
72005-11-08 Aaron S. Hawley <Aaron.Hawley@uvm.edu> (tiny change)
8
9 * files.texi (Renaming and VC): Some back-ends don't
10 handle renaming.
11
12005-11-18 Carsten Dominik <dominik@science.uva.nl> 122005-11-18 Carsten Dominik <dominik@science.uva.nl>
2 13
3 * org.texi: (FAQ): Document `org-table-tab-jumps-over-hlines'. 14 * org.texi: (FAQ): Document `org-table-tab-jumps-over-hlines'.
diff --git a/man/files.texi b/man/files.texi
index b42bf52fb39..f5adc28f168 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -1762,7 +1762,8 @@ this situation.
1762 If locking is in use, @kbd{C-x v i} leaves the file unlocked and 1762 If locking is in use, @kbd{C-x v i} leaves the file unlocked and
1763read-only. Type @kbd{C-x v v} if you wish to start editing it. After 1763read-only. Type @kbd{C-x v v} if you wish to start editing it. After
1764registering a file with CVS, you must subsequently commit the initial 1764registering a file with CVS, you must subsequently commit the initial
1765version by typing @kbd{C-x v v}. 1765version by typing @kbd{C-x v v}. Until you do that, the version
1766appears as @samp{@@@@} in the mode line.
1766 1767
1767@vindex vc-default-init-version 1768@vindex vc-default-init-version
1768@cindex initial version number to register 1769@cindex initial version number to register
@@ -2573,6 +2574,11 @@ mention the file, so that they use the new name; despite this, the
2573snapshot thus modified may not completely work (@pxref{Snapshot 2574snapshot thus modified may not completely work (@pxref{Snapshot
2574Caveats}). 2575Caveats}).
2575 2576
2577 Some backends do not provide an explicit rename operation to their
2578repositories. After issuing @code{vc-rename-file}, use @kbd{C-x v v}
2579on the original and renamed buffers and provide the necessary edit
2580log.
2581
2576 You cannot use @code{vc-rename-file} on a file that is locked by 2582 You cannot use @code{vc-rename-file} on a file that is locked by
2577someone else. 2583someone else.
2578 2584