(cvs-query-directory): Only prompt when prefix is given.

Don't behave differently when executed via M-x.  Add doc string.

2 files changed, 8 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc34f6a5ac9..9e0fcef6fa4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-25  Reiner Steib  <Reiner.Steib@gmx.de>
 
+        * pcvs.el (cvs-query-directory): Only prompt when prefix is given.
+        Don't behave differently when executed via M-x.  Add doc string.
+
         * sort.el (sort-fold-case, sort-numeric-base): Mark as
         safe-local-variable.
 
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 7da13cfd0b2..aeaea995583 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -981,13 +981,13 @@ The files are stored to DIR."
   (interactive)
   (cvs-examine default-directory t))
 
-(defun cvs-query-directory (msg)
-  ;; last-command-char = ?\r hints that the command was run via M-x
+(defun cvs-query-directory (prompt)
+  "Read directory name, prompting with PROMPT.
+If in a *cvs* buffer, don't prompt unless a prefix argument is given."
   (if (and (cvs-buffer-p)
-           (not current-prefix-arg)
-           (not (eq last-command-char ?\r)))
+           (not current-prefix-arg))
       default-directory
-    (read-directory-name msg nil default-directory nil)))
+    (read-directory-name prompt nil default-directory nil)))
 
 ;;;###autoload
 (defun cvs-quickdir (dir &optional flags noshow)