aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/diff.el')
-rw-r--r--lisp/diff.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/diff.el b/lisp/diff.el
index ee49482cfe8..06387062feb 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -190,11 +190,12 @@ is nil, REGEXP matches only half a hunk.")
190 (cons msg code)))))) 190 (cons msg code))))))
191 191
192;;;###autoload 192;;;###autoload
193(defun diff (old new &optional switches) 193(defun diff (old new &optional switches no-async)
194 "Find and display the differences between OLD and NEW files. 194 "Find and display the differences between OLD and NEW files.
195Interactively the current buffer's file name is the default for NEW 195Interactively the current buffer's file name is the default for NEW
196and a backup file for NEW is the default for OLD. 196and a backup file for NEW is the default for OLD.
197With prefix arg, prompt for diff switches." 197With prefix arg, prompt for diff switches.
198If NO-ASYNC is non-nil, call diff syncrhonously."
198 (interactive 199 (interactive
199 (nconc 200 (nconc
200 (let (oldf newf) 201 (let (oldf newf)
@@ -249,7 +250,8 @@ With prefix arg, prompt for diff switches."
249 (setq buf 250 (setq buf
250 (compile-internal command 251 (compile-internal command
251 "No more differences" "Diff" 252 "No more differences" "Diff"
252 'diff-parse-differences)) 253 'diff-parse-differences
254 nil nil nil nil nil nil no-async))
253 (set-buffer buf) 255 (set-buffer buf)
254 (set (make-local-variable 'diff-old-file) old) 256 (set (make-local-variable 'diff-old-file) old)
255 (set (make-local-variable 'diff-new-file) new) 257 (set (make-local-variable 'diff-new-file) new)