aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/diff.el')
-rw-r--r--lisp/diff.el10
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.
83Interactively the current buffer's file name is the default for NEW 83When called interactively, read OLD and NEW using the minibuffer;
84and a backup file for NEW is the default for OLD. 84the default for NEW is the current buffer's file name, and the
85default for OLD is a backup file for NEW, if one exists.
85If NO-ASYNC is non-nil, call diff synchronously. 86If NO-ASYNC is non-nil, call diff synchronously.
86With prefix arg, prompt for diff switches." 87
88When called interactively with a prefix argument, prompt
89interactively for diff switches. Otherwise, the switches
90specified 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)