* pcvs.el (cvs-do-removal): Use = instead of eq to check

the numbre of files. Bind the numbre of files to a a local
variable. Suggestd by Kevin Rodgers <ihs_4664@yahoo.com>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7024544..7dbe742 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-31  Masatake YAMATO  <jet@gyve.org>
+
+       * pcvs.el (cvs-do-removal): Use = instead of eq to check
+       the numbre of files. Bind the numbre of files to a a local
+       variable. Suggestd by Kevin Rodgers <ihs_4664@yahoo.com>.
+
 2003-08-30  Eli Zaretskii  <eliz@elta.co.il>
 
        * vc-hooks.el (vc-make-version-backup): Fix the change made on

diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 300ed10..51bbafd 100644 (file)
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -2043,10 +2043,12 @@ Returns a list of FIS that should be `cvs remove'd."
          (shrink-window-if-larger-than-buffer))))
     (if (not (or silent
                 (unwind-protect
-                    (if (eq 1 (length files))
-                        (yes-or-no-p (format "Delete file: \"%s\" ? " 
-                                             (cvs-fileinfo->file (car files))))
-                      (yes-or-no-p (format "Delete %d files? " (length files))))
+                    (yes-or-no-p 
+                     (let ((nfiles (length files)))
+                       (if (= 1 nfiles)
+                           (format "Delete file: \"%s\" ? " 
+                                   (cvs-fileinfo->file (car files)))
+                         (format "Delete %d files? " nfiles))))
                   (cvs-bury-buffer tmpbuf cvs-buffer))))
        (progn (message "Aborting") nil)
       (dolist (fi files)