aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-14 16:15:06 +0200
committerLars Magne Ingebrigtsen2011-07-14 16:15:06 +0200
commitfc233c9d7e2d39eb8f3728a9dd7dee35c81ce305 (patch)
tree773af7ea6e4be5084a2050bdd4a81bec5d865505 /lisp
parentb8151e9c3cced0908952a25763cf16a00168e44d (diff)
downloademacs-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')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc/diff.el8
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 068f1f6cb47..22574223e74 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * vc/diff.el (diff): Clarify the order the file names are read
4 (bug#7111).
5
3 * mouse.el (mouse-set-region): Link to `mouse-drag-copy-region' in 6 * mouse.el (mouse-set-region): Link to `mouse-drag-copy-region' in
4 the doc string (bug#7015). 7 the doc string (bug#7015).
5 8
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.
79When called interactively, read OLD and NEW using the minibuffer; 79When called interactively, read NEW, then OLD, using the
80the default for NEW is the current buffer's file name, and the 80minibuffer. The default for NEW is the current buffer's file
81default for OLD is a backup file for NEW, if one exists. 81name, and the default for OLD is a backup file for NEW, if one
82If NO-ASYNC is non-nil, call diff synchronously. 82exists. If NO-ASYNC is non-nil, call diff synchronously.
83 83
84When called interactively with a prefix argument, prompt 84When called interactively with a prefix argument, prompt
85interactively for diff switches. Otherwise, the switches 85interactively for diff switches. Otherwise, the switches