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

[Stefan Monnier]

Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.48 emacs/lisp/pcvs.el:1.49
*** emacs/lisp/pcvs.el:1.48     Mon Feb 10 16:48:38 2003
--- emacs/lisp/pcvs.el  Sat Mar 15 20:09:05 2003
***************
*** 14,20 ****
  ;;    (Jari Aalto+mail.emacs) address@hidden
  ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/address@hidden
  ;; Keywords: CVS, version control, release management
! ;; Revision: $Id: pcvs.el,v 1.48 2003/02/10 21:48:38 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 14,20 ----
  ;;    (Jari Aalto+mail.emacs) address@hidden
  ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/address@hidden
  ;; Keywords: CVS, version control, release management
! ;; Revision: $Id: pcvs.el,v 1.49 2003/03/16 01:09:05 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 243,259 ****
  
  ;;;;
  
! (defun cvs-mode! (&optional -cvs-mode!-fun -cvs-mode!-noerror)
    "Switch to the *cvs* buffer.
  If -CVS-MODE!-FUN is provided, it is executed *cvs* being the current buffer
    and with its window selected.  Else, the *cvs* buffer is simply selected.
- If -CVS-MODE!-NOERROR is non-nil, then failure to find a *cvs* buffer does
-   not generate an error and the current buffer is kept selected.
  -CVS-MODE!-FUN is called interactively if applicable and else with no 
argument."
    (let* ((-cvs-mode!-buf (current-buffer))
         (cvsbuf (cond ((cvs-buffer-p) (current-buffer))
                       ((and cvs-buffer (cvs-buffer-p cvs-buffer)) cvs-buffer)
-                      (-cvs-mode!-noerror (current-buffer))
                       (t (error "can't find the *cvs* buffer"))))
         (-cvs-mode!-wrapper cvs-minor-wrap-function)
         (-cvs-mode!-cont (lambda ()
--- 243,256 ----
  
  ;;;;
  
! (defun cvs-mode! (&optional -cvs-mode!-fun)
    "Switch to the *cvs* buffer.
  If -CVS-MODE!-FUN is provided, it is executed *cvs* being the current buffer
    and with its window selected.  Else, the *cvs* buffer is simply selected.
  -CVS-MODE!-FUN is called interactively if applicable and else with no 
argument."
    (let* ((-cvs-mode!-buf (current-buffer))
         (cvsbuf (cond ((cvs-buffer-p) (current-buffer))
                       ((and cvs-buffer (cvs-buffer-p cvs-buffer)) cvs-buffer)
                       (t (error "can't find the *cvs* buffer"))))
         (-cvs-mode!-wrapper cvs-minor-wrap-function)
         (-cvs-mode!-cont (lambda ()
***************
*** 1638,1644 ****
      (or (find-buffer-visiting buffile)
        (with-current-buffer (create-file-buffer buffile)
          (message "Retrieving revision %s..." rev)
!         (let ((res (call-process cvs-program nil t 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))
--- 1635,1644 ----
      (or (find-buffer-visiting buffile)
        (with-current-buffer (create-file-buffer buffile)
          (message "Retrieving revision %s..." rev)
!         ;; 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))