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

[Stefan Monnier]

Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.30 emacs/lisp/pcvs.el:1.31
*** emacs/lisp/pcvs.el:1.30     Mon Oct 29 23:41:28 2001
--- emacs/lisp/pcvs.el  Sun Dec  2 02:40:43 2001
***************
*** 13,19 ****
  ;;    (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.30 2001/10/30 04:41:28 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 13,19 ----
  ;;    (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.31 2001/12/02 07:40:43 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 173,194 ****
  (defun cvs-reread-cvsrc ()
    "Reset the default arguments to those in the `cvs-cvsrc-file'."
    (interactive)
!   (let ((cvsrc (cvs-file-to-string cvs-cvsrc-file)))
!     (when (stringp cvsrc)
!       ;; fetch the values
!       (dolist (cmd '("cvs" "checkout" "status" "log" "diff" "tag"
!                    "add" "commit" "remove" "update"))
!       (let* ((sym (intern (concat "cvs-" cmd "-flags")))
!              (val (when (string-match (concat "^" cmd "\\s-\\(.*\\)$") cvsrc)
!                     (cvs-string->strings (match-string 1 cvsrc)))))
!         (cvs-flags-set sym 0 val)))
!       ;; ensure that cvs doesn't have -q or -Q
!       (cvs-flags-set 'cvs-cvs-flags 0
!                    (cons "-f"
!                          (cdr (cvs-partition
!                                (lambda (x) (member x '("-q" "-Q")))
!                                (cvs-flags-query 'cvs-cvs-flags
!                                                 nil 'noquery))))))))
  
  ;; initialize to cvsrc's default values
  (cvs-reread-cvsrc)
--- 173,198 ----
  (defun cvs-reread-cvsrc ()
    "Reset the default arguments to those in the `cvs-cvsrc-file'."
    (interactive)
!   (condition-case nil
!       (with-temp-buffer
!       (insert-file-contents cvs-cvsrc-file)
!       ;; fetch the values
!       (dolist (cmd '("cvs" "checkout" "status" "log" "diff" "tag"
!                      "add" "commit" "remove" "update"))
!         (goto-char (point-min))
!         (let* ((sym (intern (concat "cvs-" cmd "-flags")))
!                (val (when (re-search-forward
!                            (concat "^" cmd "\\s-+\\(.*\\)$") nil t)
!                       (cvs-string->strings (match-string 1)))))
!           (cvs-flags-set sym 0 val)))
!       ;; ensure that cvs doesn't have -q or -Q
!       (cvs-flags-set 'cvs-cvs-flags 0
!                      (cons "-f"
!                            (cdr (cvs-partition
!                                  (lambda (x) (member x '("-q" "-Q")))
!                                  (cvs-flags-query 'cvs-cvs-flags
!                                                   nil 'noquery))))))
!       (file-error nil)))
  
  ;; initialize to cvsrc's default values
  (cvs-reread-cvsrc)