summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-14 16:15:06 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-14 16:15:06 +0200
commitfc233c9d7e2d39eb8f3728a9dd7dee35c81ce305 (patch)
tree773af7ea6e4be5084a2050bdd4a81bec5d865505 /lisp/vc
parentb8151e9c3cced0908952a25763cf16a00168e44d (diff)
downloademacs-fc233c9d7e2d39eb8f3728a9dd7dee35c81ce305.tar.gz
`diff' doc clarification
* vc/diff.el (diff): Clarify the order the file names are read (bug#7111).
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/diff.el8
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."
;;;###autoload
(defun diff (old new &optional switches no-async)
"Find and display the differences between OLD and NEW files.
-When called interactively, read OLD and NEW using the minibuffer;
-the default for NEW is the current buffer's file name, and the
-default for OLD is a backup file for NEW, if one exists.
-If NO-ASYNC is non-nil, call diff synchronously.
+When called interactively, read NEW, then OLD, using the
+minibuffer. The default for NEW is the current buffer's file
+name, and the default for OLD is a backup file for NEW, if one
+exists. If NO-ASYNC is non-nil, call diff synchronously.
When called interactively with a prefix argument, prompt
interactively for diff switches. Otherwise, the switches