diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-06-18 21:50:30 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-06-18 21:50:30 +0000 |
| commit | db750be70404e69f03e3f6f9e78232b90c8c295d (patch) | |
| tree | f32e07a1a1382ac6f26508e3f82f84f2ed92cc36 | |
| parent | db1f981d26d394886c6de184b98a02f732fda925 (diff) | |
| download | emacs-db750be70404e69f03e3f6f9e78232b90c8c295d.tar.gz emacs-db750be70404e69f03e3f6f9e78232b90c8c295d.tar.bz2 emacs-db750be70404e69f03e3f6f9e78232b90c8c295d.zip | |
(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.
| -rw-r--r-- | lisp/pcvs.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/pcvs.el b/lisp/pcvs.el index fccb1be1351..43b4801cac8 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -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 @@ Signal an error if there is no backup file." (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 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (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) |