[Emacs-diffs] emacs/lisp diff.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/12/28 04:40:09

Modified files:
        lisp           : diff.el 

Log message:
        (diff): Doc fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/diff.el?cvsroot=emacs&r1=1.69&r2=1.70

Patches:
Index: diff.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- diff.el     3 Dec 2008 05:48:21 -0000       1.69
+++ diff.el     28 Dec 2008 04:40:08 -0000      1.70
@@ -80,10 +80,14 @@
 ;;;###autoload
 (defun diff (old new &optional switches no-async)
   "Find and display the differences between OLD and NEW files.
-Interactively the current buffer's file name is the default for NEW
-and a backup file for NEW is the default for OLD.
+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.
-With prefix arg, prompt for diff switches."
+
+When called interactively with a prefix argument, prompt
+interactively for diff switches.  Otherwise, the switches
+specified in `diff-switches' are passed to the diff command."
   (interactive
    (let (oldf newf)
      (setq newf (buffer-file-name)