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

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0703d5134c9304c75768dd98ece2d97f2e4fa29f..72419c73601ea909b996c18594012d1f3d26be0f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +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.
+
 2007-08-24  Ulrich Mueller  <ulm@gentoo.org>  (tiny change)
 
        * files.el (backup-buffer-copy): Don't wrap delete in

diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index e5d72050cf6f4d94561270c5479d459df41d0ee8..295300434477bdba6fa62e174c747be25b7fc25e 100644 (file)
--- 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)