Mercurial > emacs
changeset 45904:4c3a4e9f96e7
(cvs-vc-command-advice): Handle the case where args
are passed to `cvs' before the command name.
(cvs-fileinfo-kill): Mark old FIs as up-to-date rather than dead.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 18 Jun 2002 21:50:30 +0000 |
| parents | bbb734dc35fd |
| children | 20781c152651 |
| files | lisp/pcvs.el |
| diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/pcvs.el Tue Jun 18 21:47:41 2002 +0000 +++ b/lisp/pcvs.el Tue Jun 18 21:50:30 2002 +0000 @@ -13,7 +13,7 @@ ;; (Jari Aalto+mail.emacs) jari.aalto@poboxes.com ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu ;; Keywords: CVS, version control, release management -;; Revision: $Id: pcvs.el,v 1.34 2002/04/03 16:56:36 kai Exp $ +;; Revision: $Id: pcvs.el,v 1.35 2002/05/16 20:03:52 monnier Exp $ ;; This file is part of GNU Emacs. @@ -1633,8 +1633,8 @@ (if (eq (cvs-fileinfo->type fi) 'DIRCHANGE) (dolist (fi (ewoc-collect c 'cvs-dir-member-p (cvs-fileinfo->dir fi))) - (setf (cvs-fileinfo->type fi) 'DEAD)) - (setf (cvs-fileinfo->type fi) 'DEAD))) + (setf (cvs-fileinfo->type fi) 'UP-TO-DATE)) + (setf (cvs-fileinfo->type fi) 'UP-TO-DATE))) (defun cvs-is-within-p (fis dir) "Non-nil is buffer is inside one of FIS (in DIR)." @@ -2126,8 +2126,12 @@ (defun cvs-vc-command-advice (command file flags) (when (and (equal command "cvs") - ;; don't parse output we don't understand. - (member (car flags) cvs-parse-known-commands)) + (progn + (while (and (stringp (car flags)) + (string-match "\\`-" (car flags))) + (pop flags)) + ;; don't parse output we don't understand. + (member (car flags) cvs-parse-known-commands))) (save-excursion (let ((buffer (current-buffer)) (dir default-directory)