# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1188044323 0
# Node ID e3a7c52130ecdc9ca56651e9066c750c31066631
# Parent  3ae2552a86bc50ff2277eb14535623bcaf39d522
(cvs-query-directory): Only prompt when prefix is given.
Don't behave differently when executed via M-x.  Add doc string.

diff -r 3ae2552a86bc -r e3a7c52130ec lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Aug 25 10:59:32 2007 +0000
+++ b/lisp/ChangeLog	Sat Aug 25 12:18:43 2007 +0000
@@ -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 -r 3ae2552a86bc -r e3a7c52130ec lisp/pcvs.el
--- a/lisp/pcvs.el	Sat Aug 25 10:59:32 2007 +0000
+++ b/lisp/pcvs.el	Sat Aug 25 12:18:43 2007 +0000
@@ -981,13 +981,13 @@
   (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)