[Emacs-diffs] Changes to emacs/lisp/diff.el

[Colin Walters]

Index: emacs/lisp/diff.el
diff -c emacs/lisp/diff.el:1.45 emacs/lisp/diff.el:1.46
*** emacs/lisp/diff.el:1.45     Wed May 22 19:26:51 2002
--- emacs/lisp/diff.el  Sat Sep  7 17:30:19 2002
***************
*** 190,200 ****
                (cons msg code))))))
  
  ;;;###autoload
! (defun diff (old new &optional switches)
    "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."
    (interactive
     (nconc
      (let (oldf newf)
--- 190,201 ----
                (cons msg code))))))
  
  ;;;###autoload
! (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.
! If NO-ASYNC is non-nil, call diff syncrhonously."
    (interactive
     (nconc
      (let (oldf newf)
***************
*** 249,255 ****
          (setq buf
                (compile-internal command
                                  "No more differences" "Diff"
!                                 'diff-parse-differences))
          (set-buffer buf)
          (set (make-local-variable 'diff-old-file) old)
          (set (make-local-variable 'diff-new-file) new)
--- 250,257 ----
          (setq buf
                (compile-internal command
                                  "No more differences" "Diff"
!                                 '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)