aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasatake YAMATO2003-09-19 18:43:16 +0000
committerMasatake YAMATO2003-09-19 18:43:16 +0000
commit9ceda1bb2270990eb3ae39e835f6db7a9bad0ce8 (patch)
tree1badd2fb60e960757f8ad30019ff12e388824458
parent9f8b58091cdbf898457c7184d99a67b5543dce65 (diff)
downloademacs-9ceda1bb2270990eb3ae39e835f6db7a9bad0ce8.tar.gz
emacs-9ceda1bb2270990eb3ae39e835f6db7a9bad0ce8.zip
Change the prompt depending on `filter' value.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/pcvs.el10
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e0d0022fcb..23714466857 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-09-19 Masatake YAMATO <jet@gyve.org>
2
3 * pcvs.el (cvs-do-removal): Change the prompt depending on
4 `filter' value.
5
12003-09-19 Glenn Morris <gmorris@ast.cam.ac.uk> 62003-09-19 Glenn Morris <gmorris@ast.cam.ac.uk>
2 7
3 * startup.el (command-line-1): Stop startup-echo-area-message 8 * startup.el (command-line-1): Stop startup-echo-area-message
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index c1cc83150bb..fe19de66047 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -2044,11 +2044,15 @@ Returns a list of FIS that should be `cvs remove'd."
2044 (if (not (or silent 2044 (if (not (or silent
2045 (unwind-protect 2045 (unwind-protect
2046 (yes-or-no-p 2046 (yes-or-no-p
2047 (let ((nfiles (length files))) 2047 (let ((nfiles (length files))
2048 (verb (if (eq filter 'undo) "Undo" "Delete")))
2048 (if (= 1 nfiles) 2049 (if (= 1 nfiles)
2049 (format "Delete file: \"%s\" ? " 2050 (format "%s file: \"%s\" ? "
2051 verb
2050 (cvs-fileinfo->file (car files))) 2052 (cvs-fileinfo->file (car files)))
2051 (format "Delete %d files? " nfiles)))) 2053 (format "%s %d files? "
2054 verb
2055 nfiles))))
2052 (cvs-bury-buffer tmpbuf cvs-buffer)))) 2056 (cvs-bury-buffer tmpbuf cvs-buffer))))
2053 (progn (message "Aborting") nil) 2057 (progn (message "Aborting") nil)
2054 (dolist (fi files) 2058 (dolist (fi files)