From: André Spiegel Date: Tue, 5 Mar 2002 13:14:11 +0000 (+0000) Subject: (vc-transfer-file): Use `make-temp-file' instead of `make-temp-name'. X-Git-Tag: ttn-vms-21-2-B4~16323 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1b1b3936ba6c34d0471b541549b2cbc1de592c2;p=emacs.git (vc-transfer-file): Use `make-temp-file' instead of `make-temp-name'. (vc-default-update-changelog): Remove conditional use of `make-temp-name'. --- diff --git a/lisp/vc.el b/lisp/vc.el index 4cbcf178532..60a6a07e943 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -6,7 +6,7 @@ ;; Maintainer: Andre Spiegel ;; Keywords: tools -;; $Id: vc.el,v 1.328 2002/02/28 09:59:08 spiegel Exp $ +;; $Id: vc.el,v 1.329 2002/02/28 13:01:48 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -2739,13 +2739,13 @@ backend to NEW-BACKEND, and unregister FILE from the current backend. ;; `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))) + (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) + (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,8 +2886,7 @@ Uses `rcs2log' which only works for RCS and CVS." (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) + (tempfile (make-temp-file (expand-file-name "vc" (or small-temporary-file-directory temporary-file-directory))))