[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/pcvs.el,v

From: Stefan Monnier
Subject: [Emacs-diffs] Changes to emacs/lisp/pcvs.el,v
Date: Wed, 14 Jun 2006 15:38:12 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        06/06/14 15:38:11

Index: pcvs.el
RCS file: /sources/emacs/emacs/lisp/pcvs.el,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- pcvs.el     27 May 2006 17:41:18 -0000      1.92
+++ pcvs.el     14 Jun 2006 15:38:10 -0000      1.93
@@ -1723,16 +1723,22 @@
          (message "Retrieving revision %s..." rev)
          ;; Discard stderr output to work around the CVS+SSH+libc
          ;; problem when stdout and stderr are the same.
-         (let ((res (apply 'call-process cvs-program nil '(t nil) nil
+         (let ((res
+                 (let ((coding-system-for-read 'binary))
+                   (apply 'call-process cvs-program nil '(t nil) nil
                            "-q" "update" "-p"
                            ;; If `rev' is HEAD, don't pass it at all:
                            ;; the default behavior is to get the head
                            ;; of the current branch whereas "-r HEAD"
                            ;; stupidly gives you the head of the trunk.
                            (append (unless (equal rev "HEAD") (list "-r" rev))
-                                   (list file)))))
+                                  (list file))))))
            (when (and res (not (and (equal 0 res))))
              (error "Something went wrong retrieving revision %s: %s" rev res))
+            ;; Figure out the encoding used and decode the byte-sequence
+            ;; into a sequence of chars.
+            (decode-coding-inserted-region
+             (point-min) (point-max) file t nil nil t)
            (set-buffer-modified-p nil)
            (let ((buffer-file-name (expand-file-name file)))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]