[Emacs-diffs] /srv/bzr/emacs/trunk r105199: `diff' doc clarification

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105199
fixes bug(s): http://debbugs.gnu.org/7111
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-14 16:15:06 +0200
message:
  `diff' doc clarification
  
  * vc/diff.el (diff): Clarify the order the file names are read
  (bug#7111).
modified:
  lisp/ChangeLog
  lisp/vc/diff.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-14 14:01:16 +0000
+++ b/lisp/ChangeLog    2011-07-14 14:15:06 +0000
@@ -1,5 +1,8 @@
 2011-07-14  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/vc/diff.el'
--- a/lisp/vc/diff.el   2011-05-02 12:22:38 +0000
+++ b/lisp/vc/diff.el   2011-07-14 14:15:06 +0000
@@ -76,10 +76,10 @@
 ;;;###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