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

[Andre Spiegel]

Index: emacs/lisp/vc.el
diff -c emacs/lisp/vc.el:1.329 emacs/lisp/vc.el:1.330
*** emacs/lisp/vc.el:1.329      Thu Feb 28 08:01:48 2002
--- emacs/lisp/vc.el    Tue Mar  5 08:14:11 2002
***************
*** 6,12 ****
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.329 2002/02/28 13:01:48 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 6,12 ----
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.330 2002/03/05 13:14:11 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 2739,2751 ****
        ;; `registered' might have switched under us.
        (vc-switch-backend file old-backend)
        (let* ((rev (vc-workfile-version file))
!            (modified-file (and edited (make-temp-name file)))
             (unmodified-file (and modified-file (vc-version-backup-file 
file))))
        ;; Go back to the base unmodified file.
        (unwind-protect
            (progn
              (when modified-file
!               (copy-file file modified-file)
                ;; If we have a local copy of the unmodified file, handle that
                ;; here and not in vc-revert-file because we don't want to
                ;; delete that copy -- it is still useful for OLD-BACKEND.
--- 2739,2751 ----
        ;; `registered' might have switched under us.
        (vc-switch-backend file old-backend)
        (let* ((rev (vc-workfile-version file))
!            (modified-file (and edited (make-temp-file file)))
             (unmodified-file (and modified-file (vc-version-backup-file 
file))))
        ;; Go back to the base unmodified file.
        (unwind-protect
            (progn
              (when modified-file
!               (copy-file file modified-file 'ok-if-already-exists)
                ;; If we have a local copy of the unmodified file, handle that
                ;; here and not in vc-revert-file because we don't want to
                ;; delete that copy -- it is still useful for OLD-BACKEND.
***************
*** 2886,2893 ****
    (let ((odefault default-directory)
        (changelog (find-change-log))
        ;; Presumably not portable to non-Unixy systems, along with rcs2log:
!       (tempfile (funcall
!                  (if (fboundp 'make-temp-file) 'make-temp-file 
'make-temp-name)
                   (expand-file-name "vc"
                                     (or small-temporary-file-directory
                                         temporary-file-directory))))
--- 2886,2892 ----
    (let ((odefault default-directory)
        (changelog (find-change-log))
        ;; Presumably not portable to non-Unixy systems, along with rcs2log:
!       (tempfile (make-temp-file
                   (expand-file-name "vc"
                                     (or small-temporary-file-directory
                                         temporary-file-directory))))