diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/diff.el | 8 |
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 @@ 2011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org> + * vc/diff.el (diff): Clarify the order the file names are read + (bug#7111). + * mouse.el (mouse-set-region): Link to `mouse-drag-copy-region' in the doc string (bug#7015). 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 |