Mercurial > emacs
changeset 34412:da1ec51d3da7
(cvs-mode-marked): Set up the default for CMD manually.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 11 Dec 2000 03:20:21 +0000 |
| parents | 8bc4d3f8994c |
| children | 6cc258b2f6f6 |
| files | lisp/pcvs.el |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/pcvs.el Mon Dec 11 02:59:40 2000 +0000 +++ b/lisp/pcvs.el Mon Dec 11 03:20:21 2000 +0000 @@ -14,7 +14,7 @@ ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu ;; Keywords: CVS, version control, release management ;; Version: $Name: $ -;; Revision: $Id: pcvs.el,v 1.20 2000/12/08 16:58:45 monnier Exp $ +;; Revision: $Id: pcvs.el,v 1.21 2000/12/10 21:20:56 monnier Exp $ ;; This file is part of GNU Emacs. @@ -1237,13 +1237,12 @@ (push fi fis) ;; If a directory is selected, return members, if any. (setq fis - (append (ewoc-collect cvs-cookies - 'cvs-dir-member-p - (cvs-fileinfo->dir fi)) + (append (ewoc-collect + cvs-cookies 'cvs-dir-member-p (cvs-fileinfo->dir fi)) fis)))) (nreverse fis))) -(defun* cvs-mode-marked (filter &optional (cmd (symbol-name filter)) +(defun* cvs-mode-marked (filter &optional cmd &key read-only one file noquery) "Get the list of marked FIS. CMD is used to determine whether to use the marks or not. @@ -1251,6 +1250,7 @@ If READ-ONLY is non-nil, the current toggling is left intact. If ONE is non-nil, marks are ignored and a single FI is returned. If FILE is non-nil, directory entries won't be selected." + (unless cmd (setq cmd (symbol-name filter))) (let* ((fis (cvs-get-marked (or one (cvs-ignore-marks-p cmd read-only)) (and (not file) (cvs-applicable-p 'DIRCHANGE filter)))) @@ -1262,7 +1262,7 @@ (message (if (null fis) "`%s' is not applicable to any of the selected files." "`%s' is only applicable to a single file.") cmd) - (sit-for 0.5) + (sit-for 1) (setq fis (list (cvs-insert-file (read-file-name (format "File to %s: " cmd)))))) (if one (car fis) fis)))