(cvs-mark-fis-dead): New function.

(cvs-mode-add): Use it.
(cvs-mode-add-change-log-entry-other-window):
Rebind change-log-default-name to itself rather than to nil.

2 files changed, 15 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19c1278085e..c90a1f02d9e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-29  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * pcvs.el (cvs-mark-fis-dead): New function.
+        (cvs-mode-add): Use it.
+        (cvs-mode-add-change-log-entry-other-window):
+        Rebind change-log-default-name to itself rather than to nil.
+
 2001-01-29  Sam Steingold  <sds@gnu.org>
 
         * vc-cvs.el: replaced (require 'vc) with a bunch of
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 1b83fa32448..5d8ee400f34 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.23 2000/12/18 03:17:40 monnier Exp $
+;; Revision: $Id: pcvs.el,v 1.24 2001/01/26 20:46:42 fx Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -1349,6 +1349,11 @@ The POSTPROC specified there (typically `log-edit') is then called,
     (goto-char (ewoc-location last))
     (ewoc-data last)))
 
+(defun cvs-mark-fis-dead (fis)
+  ;; Helper function, introduced because of the need for macro-expansion.
+  (dolist (fi fis)
+    (setf (cvs-fileinfo->type fi) 'DEAD)))
+
 (defun-cvs-mode (cvs-mode-add . SIMPLE) (flags)
   "Add marked files to the cvs repository.
 With prefix argument, prompt for cvs flags."
@@ -1372,7 +1377,7 @@ With prefix argument, prompt for cvs flags."
               `((cvs-run-process (list "-n" "update")
                                  ',dirs
                                  '(cvs-parse-process t))
-                (dolist (fi ',dirs) (setf (cvs-fileinfo->type fi) 'DEAD))))))
+                (cvs-mark-fis-dead ',dirs)))))
       (cvs-mode-run "add" flags fis :postproc postproc))))
 
 (defun-cvs-mode (cvs-mode-diff . DOUBLE) (flags)
@@ -1918,7 +1923,7 @@ With prefix argument, prompt for cvs flags."
   (let* ((fi (cvs-mode-marked nil nil :one t))
          (default-directory (cvs-expand-dir-name (cvs-fileinfo->dir fi)))
          (buffer-file-name (expand-file-name (cvs-fileinfo->file fi)))
-         change-log-default-name)
+         (change-log-default-name change-log-default-name))
     (add-change-log-entry-other-window)))
 
 ;; interactive commands to set optional flags