diff options
| author | Lars Magne Ingebrigtsen | 2011-07-14 16:15:06 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-14 16:15:06 +0200 |
| commit | fc233c9d7e2d39eb8f3728a9dd7dee35c81ce305 (patch) | |
| tree | 773af7ea6e4be5084a2050bdd4a81bec5d865505 /lisp/vc/diff.el | |
| parent | b8151e9c3cced0908952a25763cf16a00168e44d (diff) | |
| download | emacs-fc233c9d7e2d39eb8f3728a9dd7dee35c81ce305.tar.gz emacs-fc233c9d7e2d39eb8f3728a9dd7dee35c81ce305.zip | |
`diff' doc clarification
* vc/diff.el (diff): Clarify the order the file names are read
(bug#7111).
Diffstat (limited to 'lisp/vc/diff.el')
| -rw-r--r-- | lisp/vc/diff.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index 9655ce64a99..fd24558da6a 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el | |||
| @@ -76,10 +76,10 @@ delete the temporary files so named." | |||
| 76 | ;;;###autoload | 76 | ;;;###autoload |
| 77 | (defun diff (old new &optional switches no-async) | 77 | (defun diff (old new &optional switches no-async) |
| 78 | "Find and display the differences between OLD and NEW files. | 78 | "Find and display the differences between OLD and NEW files. |
| 79 | When called interactively, read OLD and NEW using the minibuffer; | 79 | When called interactively, read NEW, then OLD, using the |
| 80 | the default for NEW is the current buffer's file name, and the | 80 | minibuffer. The default for NEW is the current buffer's file |
| 81 | default for OLD is a backup file for NEW, if one exists. | 81 | name, and the default for OLD is a backup file for NEW, if one |
| 82 | If NO-ASYNC is non-nil, call diff synchronously. | 82 | exists. If NO-ASYNC is non-nil, call diff synchronously. |
| 83 | 83 | ||
| 84 | When called interactively with a prefix argument, prompt | 84 | When called interactively with a prefix argument, prompt |
| 85 | interactively for diff switches. Otherwise, the switches | 85 | interactively for diff switches. Otherwise, the switches |