# HG changeset patch
# User Colin Walters <walters@gnu.org>
# Date 1031434219 0
# Node ID bac8aaf18835188c59d457cd8fdbda4fcf5055f1
# Parent  5128d5a8980c10c3c9f7ad265ebdb5ed756ca28d
(diff): Add optional argument no-async, and use the above argument.

diff -r 5128d5a8980c -r bac8aaf18835 lisp/diff.el
--- a/lisp/diff.el	Sat Sep 07 21:29:44 2002 +0000
+++ b/lisp/diff.el	Sat Sep 07 21:30:19 2002 +0000
@@ -190,11 +190,12 @@
 		(cons msg code))))))
 
 ;;;###autoload
-(defun diff (old new &optional switches)
+(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.
-With prefix arg, prompt for diff switches."
+With prefix arg, prompt for diff switches.
+If NO-ASYNC is non-nil, call diff syncrhonously."
   (interactive
    (nconc
     (let (oldf newf)
@@ -249,7 +250,8 @@
 	  (setq buf
 		(compile-internal command
 				  "No more differences" "Diff"
-				  'diff-parse-differences))
+				  'diff-parse-differences
+				  nil nil nil nil nil nil no-async))
 	  (set-buffer buf)
 	  (set (make-local-variable 'diff-old-file) old)
 	  (set (make-local-variable 'diff-new-file) new)