From bb61abb8a10b460c78483cc802277a5d2b36ad92 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sun, 31 Aug 2003 02:11:21 +0000 Subject: [PATCH] * 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 . --- lisp/ChangeLog | 6 ++++++ lisp/pcvs.el | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7024544dc24..7dbe7425530 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2003-08-31 Masatake YAMATO + + * 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 . + 2003-08-30 Eli Zaretskii * vc-hooks.el (vc-make-version-backup): Fix the change made on diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 300ed10c9cd..51bbafd8d3c 100644 --- 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) -- 2.11.4.GIT