190 |
(cons msg code)))))) |
(cons msg code)))))) |
191 |
|
|
192 |
;;;###autoload |
;;;###autoload |
193 |
(defun diff (old new &optional switches) |
(defun diff (old new &optional switches no-async) |
194 |
"Find and display the differences between OLD and NEW files. |
"Find and display the differences between OLD and NEW files. |
195 |
Interactively the current buffer's file name is the default for NEW |
Interactively the current buffer's file name is the default for NEW |
196 |
and a backup file for NEW is the default for OLD. |
and a backup file for NEW is the default for OLD. |
197 |
With prefix arg, prompt for diff switches." |
With prefix arg, prompt for diff switches. |
198 |
|
If NO-ASYNC is non-nil, call diff synchronously." |
199 |
(interactive |
(interactive |
200 |
(nconc |
(nconc |
201 |
(let (oldf newf) |
(let (oldf newf) |
250 |
(setq buf |
(setq buf |
251 |
(compile-internal command |
(compile-internal command |
252 |
"No more differences" "Diff" |
"No more differences" "Diff" |
253 |
'diff-parse-differences)) |
'diff-parse-differences |
254 |
|
nil nil nil nil nil nil no-async)) |
255 |
(set-buffer buf) |
(set-buffer buf) |
256 |
(set (make-local-variable 'diff-old-file) old) |
(set (make-local-variable 'diff-old-file) old) |
257 |
(set (make-local-variable 'diff-new-file) new) |
(set (make-local-variable 'diff-new-file) new) |