aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel1999-10-02 10:53:18 +0000
committerAndré Spiegel1999-10-02 10:53:18 +0000
commit3b9dc2bca53c547769d29e72d48b756edc30564f (patch)
tree8f5cce265df97f6e0ab94ce1eb7161544b590a0b
parent3241b756327df20e05dad1e1828d57b3d06e8da3 (diff)
downloademacs-3b9dc2bca53c547769d29e72d48b756edc30564f.tar.gz
emacs-3b9dc2bca53c547769d29e72d48b756edc30564f.zip
(vc-backend-checkout): Use coding system 'no-conversion when doing
with-temp-file.
-rw-r--r--lisp/vc.el58
1 files changed, 32 insertions, 26 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 0f131fd5d5a..1381b11e8fc 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
5;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> 6;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
7 7
8;; $Id: vc.el,v 1.254 1999/09/06 22:15:10 rms Exp $ 8;; $Id: vc.el,v 1.255 1999/09/22 12:58:49 spiegel Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -2595,16 +2595,18 @@ THRESHOLD, nil otherwise"
2595 (failed t)) 2595 (failed t))
2596 (unwind-protect 2596 (unwind-protect
2597 (progn 2597 (progn
2598 (with-temp-file filename 2598 (let ((coding-system-for-read 'no-conversion)
2599 (apply 'vc-do-command 2599 (coding-system-for-write 'no-conversion))
2600 (current-buffer) 0 "get" file 'MASTER 2600 (with-temp-file filename
2601 "-s" ;; suppress diagnostic output 2601 (apply 'vc-do-command
2602 (if writable "-e") 2602 (current-buffer) 0 "get" file 'MASTER
2603 "-p" 2603 "-s" ;; suppress diagnostic output
2604 (and rev 2604 (if writable "-e")
2605 (concat "-r" 2605 "-p"
2606 (vc-lookup-triple file rev))) 2606 (and rev
2607 switches)) 2607 (concat "-r"
2608 (vc-lookup-triple file rev)))
2609 switches)))
2608 (set-file-modes filename 2610 (set-file-modes filename
2609 (logior (file-modes (vc-name file)) 2611 (logior (file-modes (vc-name file))
2610 (if writable 128 0))) 2612 (if writable 128 0)))
@@ -2624,13 +2626,15 @@ THRESHOLD, nil otherwise"
2624 (failed t)) 2626 (failed t))
2625 (unwind-protect 2627 (unwind-protect
2626 (progn 2628 (progn
2627 (with-temp-file filename 2629 (let ((coding-system-for-read 'no-conversion)
2628 (apply 'vc-do-command 2630 (coding-system-for-write 'no-conversion))
2629 (current-buffer) 0 "co" file 'MASTER 2631 (with-temp-file filename
2630 "-q" ;; suppress diagnostic output 2632 (apply 'vc-do-command
2631 (if writable "-l") 2633 (current-buffer) 0 "co" file 'MASTER
2632 (concat "-p" rev) 2634 "-q" ;; suppress diagnostic output
2633 switches)) 2635 (if writable "-l")
2636 (concat "-p" rev)
2637 switches)))
2634 (set-file-modes filename 2638 (set-file-modes filename
2635 (logior (file-modes (vc-name file)) 2639 (logior (file-modes (vc-name file))
2636 (if writable 128 0))) 2640 (if writable 128 0)))
@@ -2675,14 +2679,16 @@ THRESHOLD, nil otherwise"
2675 (let ((failed t)) 2679 (let ((failed t))
2676 (unwind-protect 2680 (unwind-protect
2677 (progn 2681 (progn
2678 (with-temp-file filename 2682 (let ((coding-system-for-read 'no-conversion)
2679 (apply 'vc-do-command 2683 (coding-system-for-write 'no-conversion))
2680 (current-buffer) 0 "cvs" file 'WORKFILE 2684 (with-temp-file filename
2681 "-Q" ;; suppress diagnostic output 2685 (apply 'vc-do-command
2682 "update" 2686 (current-buffer) 0 "cvs" file 'WORKFILE
2683 (concat "-r" rev) 2687 "-Q" ;; suppress diagnostic output
2684 "-p" 2688 "update"
2685 switches)) 2689 (concat "-r" rev)
2690 "-p"
2691 switches)))
2686 (setq failed nil)) 2692 (setq failed nil))
2687 (and failed (file-exists-p filename) (delete-file filename)))) 2693 (and failed (file-exists-p filename) (delete-file filename))))
2688 ;; default for verbose checkout: clear the sticky tag 2694 ;; default for verbose checkout: clear the sticky tag