[Emacs-diffs] Changes to emacs/lisp/vc-arch.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/vc-arch.el
diff -c emacs/lisp/vc-arch.el:1.6.2.1 emacs/lisp/vc-arch.el:1.6.2.2
*** emacs/lisp/vc-arch.el:1.6.2.1       Fri Apr 16 12:50:10 2004
--- emacs/lisp/vc-arch.el       Mon Jun 28 07:28:47 2004
***************
*** 272,278 ****
                ;; Buh?  Unexpected format.
                'edited
              (let ((ats (file-attributes file)))
!               (if (and (= (nth 7 ats) (string-to-number (match-string 2)))
                         (equal (format-time-string "%s" (nth 5 ats))
                                (match-string 1)))
                    'up-to-date
--- 272,278 ----
                ;; Buh?  Unexpected format.
                'edited
              (let ((ats (file-attributes file)))
!               (if (and (eq (nth 7 ats) (string-to-number (match-string 2)))
                         (equal (format-time-string "%s" (nth 5 ats))
                                (match-string 1)))
                    'up-to-date
***************
*** 375,381 ****
      (vc-arch-command nil 0 file "commit" "-s" summary "-L" comment "--"
                     (vc-switches 'Arch 'checkin))))
  
! (defun vc-arch-diff (file &optional oldvers newvers)
    "Get a difference report using Arch between two versions of FILE."
    (if (and newvers
           (vc-up-to-date-p file)
--- 375,381 ----
      (vc-arch-command nil 0 file "commit" "-s" summary "-L" comment "--"
                     (vc-switches 'Arch 'checkin))))
  
! (defun vc-arch-diff (file &optional oldvers newvers buffer)
    "Get a difference report using Arch between two versions of FILE."
    (if (and newvers
           (vc-up-to-date-p file)
***************
*** 390,396 ****
           (default-directory (vc-arch-root file))
           (status
            (vc-arch-command
!            "*vc-diff*"
             (if async 'async 1)
             nil "file-diffs"
             ;; Arch does not support the typical flags.
--- 390,396 ----
           (default-directory (vc-arch-root file))
           (status
            (vc-arch-command
!            (or buffer "*vc-diff*")
             (if async 'async 1)
             nil "file-diffs"
             ;; Arch does not support the typical flags.