Mercurial > emacs
comparison man/files.texi @ 90203:187d6a1f84f7
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 22 Jul 2005 08:27:27 +0000 |
parents | fbb2bea03df9 f7a51b4ea78b |
children | 890cc78a5a24 |
comparison
equal
deleted
inserted
replaced
90202:7597b4a23c3b | 90203:187d6a1f84f7 |
---|---|
1641 | 1641 |
1642 @findex vc-annotate | 1642 @findex vc-annotate |
1643 @kindex C-x v g | 1643 @kindex C-x v g |
1644 For some backends, you can display the file @dfn{annotated} with | 1644 For some backends, you can display the file @dfn{annotated} with |
1645 per-line version information and using colors to enhance the visual | 1645 per-line version information and using colors to enhance the visual |
1646 appearance, with the the command @kbd{M-x vc-annotate}. | 1646 appearance, with the command @kbd{M-x vc-annotate}. |
1647 It creates a new buffer | 1647 It creates a new buffer |
1648 to display file's text, colored to show how old each part is. Text | 1648 to display file's text, colored to show how old each part is. Text |
1649 colored red is new, blue means old, and intermediate colors indicate | 1649 colored red is new, blue means old, and intermediate colors indicate |
1650 intermediate ages. By default, the time scale is 360 days, so that | 1650 intermediate ages. By default, the time scale is 360 days, so that |
1651 everything more than one year old is shown in blue. | 1651 everything more than one year old is shown in blue. |
2921 The command @kbd{M-x compare-windows} compares the text in the current | 2921 The command @kbd{M-x compare-windows} compares the text in the current |
2922 window with that in the next window. Comparison starts at point in each | 2922 window with that in the next window. Comparison starts at point in each |
2923 window, and each starting position is pushed on the mark ring in its | 2923 window, and each starting position is pushed on the mark ring in its |
2924 respective buffer. Then point moves forward in each window, a character | 2924 respective buffer. Then point moves forward in each window, a character |
2925 at a time, until a mismatch between the two windows is reached. Then | 2925 at a time, until a mismatch between the two windows is reached. Then |
2926 the command is finished. For more information about windows in Emacs, | 2926 the command is finished. Another invocation of this command with |
2927 @ref{Windows}. | 2927 points on mismatching positions tries to skip non-matching text and |
2928 move points forward, until a match between the two windows is reached. | |
2929 For more information about windows in Emacs, @ref{Windows}. | |
2928 | 2930 |
2929 @vindex compare-ignore-case | 2931 @vindex compare-ignore-case |
2930 @vindex compare-ignore-whitespace | 2932 @vindex compare-ignore-whitespace |
2931 With a numeric argument, @code{compare-windows} ignores changes in | 2933 With a numeric argument, @code{compare-windows} ignores changes in |
2932 whitespace. If the variable @code{compare-ignore-case} is | 2934 whitespace. If the variable @code{compare-ignore-case} is |