/[emacs]/emacs/lisp/diff.el
ViewVC logotype

Diff of /emacs/lisp/diff.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.45 by rost, Wed May 22 23:26:51 2002 UTC revision 1.45.2.1 by miles, Fri Apr 4 06:20:03 2003 UTC
# Line 190  is nil, REGEXP matches only half a hunk. Line 190  is nil, REGEXP matches only half a hunk.
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)
# Line 249  With prefix arg, prompt for diff switche Line 250  With prefix arg, prompt for diff switche
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)

Legend:
Removed from v.1.45  
changed lines
  Added in v.1.45.2.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26