diff options
| author | André Spiegel | 2001-10-29 12:26:15 +0000 |
|---|---|---|
| committer | André Spiegel | 2001-10-29 12:26:15 +0000 |
| commit | 3f19e41228ec346cd77e669d4cd78886ae085972 (patch) | |
| tree | c2c84ce141840c786bb27553c5cf774063a5d29c | |
| parent | 3f08fcd2a6c25d95cb83d2fa0d96ea45c35ef79f (diff) | |
| download | emacs-3f19e41228ec346cd77e669d4cd78886ae085972.tar.gz emacs-3f19e41228ec346cd77e669d4cd78886ae085972.zip | |
# Doc fix, completing prev change.
| -rw-r--r-- | lisp/vc.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 63ba023a405..c009e055e95 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | ;; Keywords: tools | 7 | ;; Keywords: tools |
| 8 | 8 | ||
| 9 | ;; $Id: vc.el,v 1.315 2001/10/22 12:13:29 spiegel Exp $ | 9 | ;; $Id: vc.el,v 1.316 2001/10/29 12:21:26 spiegel Exp $ |
| 10 | 10 | ||
| 11 | ;; This file is part of GNU Emacs. | 11 | ;; This file is part of GNU Emacs. |
| 12 | 12 | ||
| @@ -285,13 +285,15 @@ | |||
| 285 | ;; | 285 | ;; |
| 286 | ;; * diff (file &optional rev1 rev2) | 286 | ;; * diff (file &optional rev1 rev2) |
| 287 | ;; | 287 | ;; |
| 288 | ;; Insert the diff for FILE into the *vc-diff* buffer. If REV1 and REV2 | 288 | ;; Insert the diff for FILE into the *vc-diff* buffer. If REV1 and |
| 289 | ;; are non-nil, report differences from REV1 to REV2. If REV1 is nil, | 289 | ;; REV2 are non-nil, report differences from REV1 to REV2. If REV1 |
| 290 | ;; use the current workfile version (as found in the repository) as the | 290 | ;; is nil, use the current workfile version (as found in the |
| 291 | ;; older version; if REV2 is nil, use the current workfile contents as | 291 | ;; repository) as the older version; if REV2 is nil, use the current |
| 292 | ;; the newer version. This function should return a status of either 0 | 292 | ;; workfile contents as the newer version. This function should |
| 293 | ;; (no differences found), or 1 (either non-empty diff or the diff is | 293 | ;; pass the value of (vc-diff-switches-list BACKEND) to the backend |
| 294 | ;; run asynchronously). | 294 | ;; command. It should return a status of either 0 (no differences |
| 295 | ;; found), or 1 (either non-empty diff or the diff is run | ||
| 296 | ;; asynchronously). | ||
| 295 | ;; | 297 | ;; |
| 296 | ;; - diff-tree (dir &optional rev1 rev2) | 298 | ;; - diff-tree (dir &optional rev1 rev2) |
| 297 | ;; | 299 | ;; |