summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorReiner Steib <Reiner.Steib@gmx.de>2007-08-25 12:18:43 +0000
committerReiner Steib <Reiner.Steib@gmx.de>2007-08-25 12:18:43 +0000
commitfe2d294365e2a8ef4e4b5e3bdb365b2d6d796f4e (patch)
tree84ceaa1130311765ae365db0d05d8fdf795dbea4 /lisp
parent3f51e0ced21146eb107f2293d70975c33c5e7de0 (diff)
downloademacs-fe2d294365e2a8ef4e4b5e3bdb365b2d6d796f4e.tar.gz
(cvs-query-directory): Only prompt when prefix is given.
Don't behave differently when executed via M-x. Add doc string.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/pcvs.el10
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 45c8c9585b3..14582010c49 100644
--- 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 e5d72050cf6..29530043447 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)