diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e0d0022fcb..23714466857 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-19  Masatake YAMATO  <jet@gyve.org>
+
+	* pcvs.el (cvs-do-removal): Change the prompt depending on
+	`filter' value.
+
 2003-09-19  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
 	* 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."
     (if (not (or silent
 		 (unwind-protect
 		     (yes-or-no-p 
-		      (let ((nfiles (length files)))
+		      (let ((nfiles (length files))
+			    (verb (if (eq filter 'undo) "Undo" "Delete")))
 			(if (= 1 nfiles)
-			    (format "Delete file: \"%s\" ? " 
+			    (format "%s file: \"%s\" ? " 
+				    verb
 				    (cvs-fileinfo->file (car files)))
-			  (format "Delete %d files? " nfiles))))
+			  (format "%s %d files? " 
+				  verb
+				  nfiles))))
 		   (cvs-bury-buffer tmpbuf cvs-buffer))))
 	(progn (message "Aborting") nil)
       (dolist (fi files)