diff options
| author | Chong Yidong | 2008-12-28 04:40:08 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-12-28 04:40:08 +0000 |
| commit | 55fdbbb55baee71d6523b9b7513549249e5743bb (patch) | |
| tree | 0f70bbe590514a7f9ba4613e59726dade4765ba0 | |
| parent | 3dfe36a55fecfa226e031e5561dc8c86642e221c (diff) | |
| download | emacs-55fdbbb55baee71d6523b9b7513549249e5743bb.tar.gz emacs-55fdbbb55baee71d6523b9b7513549249e5743bb.zip | |
(diff): Doc fix.
| -rw-r--r-- | lisp/diff.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index e802048c31d..da6eb3d538c 100644 --- a/lisp/diff.el +++ b/lisp/diff.el | |||
| @@ -80,10 +80,14 @@ were found." | |||
| 80 | ;;;###autoload | 80 | ;;;###autoload |
| 81 | (defun diff (old new &optional switches no-async) | 81 | (defun diff (old new &optional switches no-async) |
| 82 | "Find and display the differences between OLD and NEW files. | 82 | "Find and display the differences between OLD and NEW files. |
| 83 | Interactively the current buffer's file name is the default for NEW | 83 | When called interactively, read OLD and NEW using the minibuffer; |
| 84 | and a backup file for NEW is the default for OLD. | 84 | the default for NEW is the current buffer's file name, and the |
| 85 | default for OLD is a backup file for NEW, if one exists. | ||
| 85 | If NO-ASYNC is non-nil, call diff synchronously. | 86 | If NO-ASYNC is non-nil, call diff synchronously. |
| 86 | With prefix arg, prompt for diff switches." | 87 | |
| 88 | When called interactively with a prefix argument, prompt | ||
| 89 | interactively for diff switches. Otherwise, the switches | ||
| 90 | specified in `diff-switches' are passed to the diff command." | ||
| 87 | (interactive | 91 | (interactive |
| 88 | (let (oldf newf) | 92 | (let (oldf newf) |
| 89 | (setq newf (buffer-file-name) | 93 | (setq newf (buffer-file-name) |