Mercurial > emacs
changeset 100729:e60cb7984ff1
(diff): Doc fix.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 28 Dec 2008 04:40:08 +0000 |
| parents | 11101e16e203 |
| children | aee904e30562 |
| files | lisp/diff.el |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/diff.el Sun Dec 28 04:38:44 2008 +0000 +++ b/lisp/diff.el Sun Dec 28 04:40:08 2008 +0000 @@ -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)