From: Nick Roberts <nickrob@snap.net.nz>
Date: Fri, 27 May 2005 01:36:41 +0000 (+0000)
Subject: (Log Buffer): Merge in description of Log Edit
X-Git-Tag: emacs-pretest-22.0.90~9508
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e07ddddb891c37ac6ecabebf3c86f3b4dda246c7;p=emacs.git

(Log Buffer): Merge in description of Log Edit
mode from pcl-cvs.texi.
---

diff --git a/man/files.texi b/man/files.texi
index 6be4d0f467d..c83572a8550 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -1526,8 +1526,29 @@ Version Control}).
 
   When you check in changes, @kbd{C-x v v} first reads a log entry.  It
 pops up a buffer called @samp{*VC-Log*} for you to enter the log entry.
-When you are finished, type @kbd{C-c C-c} in the @samp{*VC-Log*} buffer.
-That is when check-in really happens.
+
+Sometimes the @samp{*VC-Log*} buffer contains default text when you enter it,
+typically the last log message entered.  If it does, mark and point
+are set around the entire contents of the buffer so that it is easy to
+kill the contents of the buffer with @kbd{C-w}.
+
+@findex log-edit-insert-changelog
+If you work by writing entries in the @file{ChangeLog}
+(@pxref{Change Log}) and then commit the change under revision
+control, you can generate the Log Edit text from the ChangeLog using
+@kbd{C-c C-a} (@kbd{log-edit-insert-changelog}).  This looks for
+entries for the file(s) concerned in the top entry in the ChangeLog
+and uses those paragraphs as the log text.  This text is only inserted
+if the top entry was made under your user name on the current date.
+@xref{Change Logs and VC}, for the opposite way of
+working---generating ChangeLog entries from the revision control log.
+
+In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x log-edit-show-files})
+shows the list of files to be committed in case you need to check
+that.
+
+When you have finished editing the log message, type @kbd{C-c C-c} to
+exit the buffer and commit the change.
 
   To abort check-in, just @strong{don't} type @kbd{C-c C-c} in that
 buffer.  You can switch buffers and do other editing.  As long as you