aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-08-07 05:21:28 +0000
committerDan Nicolaescu2008-08-07 05:21:28 +0000
commit5f14a5b35ee77469060be6d4fb4ce8a1ef0624fc (patch)
tree789fcf2e49ea569c7989b0582648600f965db4ea
parent55e8d9a5577d89d3dd866e43da6cd38149b62f2e (diff)
downloademacs-5f14a5b35ee77469060be6d4fb4ce8a1ef0624fc.tar.gz
emacs-5f14a5b35ee77469060be6d4fb4ce8a1ef0624fc.zip
(Log Buffer): Describe C-c C-d.
(Diff Mode): Describe C-x 4 A.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/files.texi8
2 files changed, 12 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 013bc7c9bf0..6ee8e90b04b 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12008-08-07 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * files.texi (Log Buffer): Describe C-c C-d.
4 (Diff Mode): Describe C-x 4 A.
5
12008-08-06 Eli Zaretskii <eliz@gnu.org> 62008-08-06 Eli Zaretskii <eliz@gnu.org>
2 7
3 * vc1-xtra.texi (VC Directory Mode): Fix last change. 8 * vc1-xtra.texi (VC Directory Mode): Fix last change.
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 9297c941a99..37b960f1826 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1807,7 +1807,8 @@ the revision control log.
1807 In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x 1807 In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x
1808log-edit-show-files}) shows the list of files to be committed in case 1808log-edit-show-files}) shows the list of files to be committed in case
1809you need to check that. (This can be a list of more than one file if 1809you need to check that. (This can be a list of more than one file if
1810you use VC Directory Mode or PCL-CVS.) 1810you use VC Directory Mode or PCL-CVS.) @kbd{C-c C-f} (@kbd{M-x
1811log-edit-show-diff}) shows the diff for the files to be committed.
1811@iftex 1812@iftex
1812@xref{VC Directory Mode,,,emacs-xtra, Specialized Emacs Features}, 1813@xref{VC Directory Mode,,,emacs-xtra, Specialized Emacs Features},
1813@end iftex 1814@end iftex
@@ -2613,6 +2614,11 @@ only the text within the region.
2613@item C-c C-w 2614@item C-c C-w
2614Refine the current hunk so that it disregards changes in whitespace 2615Refine the current hunk so that it disregards changes in whitespace
2615(@code{diff-refine-hunk}). 2616(@code{diff-refine-hunk}).
2617
2618@item C-x 4 A
2619Iterates over the diff hunks and does a @kbd{C-x 4 a} for each one of
2620them. The goal is to create a skeleton for the ChangeLog that can be
2621later filled in.
2616@end table 2622@end table
2617 2623
2618 @kbd{C-x 4 a} in Diff mode operates on behalf of the target file, 2624 @kbd{C-x 4 a} in Diff mode operates on behalf of the target file,