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

[Stefan Monnier]

Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.54 emacs/lisp/pcvs.el:1.55
*** emacs/lisp/pcvs.el:1.54     Fri May  9 18:37:44 2003
--- emacs/lisp/pcvs.el  Mon May 12 13:49:22 2003
***************
*** 1,6 ****
  ;;; pcvs.el --- a front-end to CVS
  
! ;; Copyright (C) 1991,92,93,94,95,95,97,98,99,2000,2002
  ;;             Free Software Foundation, Inc.
  
  ;; Author: (The PCL-CVS Trust) address@hidden
--- 1,6 ----
  ;;; pcvs.el --- a front-end to CVS
  
! ;; Copyright (C) 1991,92,93,94,95,95,97,98,99,2000,02,2003
  ;;             Free Software Foundation, Inc.
  
  ;; Author: (The PCL-CVS Trust) address@hidden
***************
*** 1638,1645 ****
          ;; Discard stderr output to work around the CVS+SSH+libc
          ;; problem when stdout and stderr are the same.
          ;; FIXME: this doesn't seem to make any difference :-(
!         (let ((res (call-process cvs-program nil '(t . nil) nil
!                                  "-q" "update" "-p" "-r" rev file)))
            (when (and res (not (and (equal 0 res))))
              (error "Something went wrong retrieving revision %s: %s" rev res))
            (set-buffer-modified-p nil)
--- 1638,1651 ----
          ;; Discard stderr output to work around the CVS+SSH+libc
          ;; problem when stdout and stderr are the same.
          ;; FIXME: this doesn't seem to make any difference :-(
!         (let ((res (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)))))
            (when (and res (not (and (equal 0 res))))
              (error "Something went wrong retrieving revision %s: %s" rev res))
            (set-buffer-modified-p nil)