Mercurial > emacs
changeset 47301:bac8aaf18835
(diff): Add optional argument no-async, and use the above argument.
| author | Colin Walters <walters@gnu.org> |
|---|---|
| date | Sat, 07 Sep 2002 21:30:19 +0000 |
| parents | 5128d5a8980c |
| children | 9f4e1e4aded6 |
| files | lisp/diff.el |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)