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

[Stefan Monnier]

Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.32 emacs/lisp/pcvs.el:1.33
*** emacs/lisp/pcvs.el:1.32     Thu Dec 20 13:43:35 2001
--- emacs/lisp/pcvs.el  Fri Jan 25 17:41:28 2002
***************
*** 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.32 2001/12/20 18:43:35 pj 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.33 2002/01/25 22:41:28 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 180,195 ****
        (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)))
--- 180,195 ----
        (dolist (cmd '("cvs" "checkout" "status" "log" "diff" "tag"
                       "add" "commit" "remove" "update"))
          (goto-char (point-min))
!         (when (re-search-forward
!                (concat "^" cmd "\\(\\s-+\\(.*\\)\\)?$") nil t)
!           (let* ((sym (intern (concat "cvs-" cmd "-flags")))
!                  (val (cvs-string->strings (or (match-string 2) ""))))
!             (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" "-f")))
                                   (cvs-flags-query 'cvs-cvs-flags
                                                    nil 'noquery))))))
        (file-error nil)))