diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-12-11 03:20:29 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-12-11 03:20:29 +0000 |
| commit | 802cf66c54be8f762c4b65a0a4d91010fdc7cd1e (patch) | |
| tree | 4ddb41ae1b7aab8fd792c6ac4ab73d00cfb47eaa /lisp/pcvs.el | |
| parent | fb97d87f8d6212b5c3b22b6b5667547a4422aa2d (diff) | |
| download | emacs-802cf66c54be8f762c4b65a0a4d91010fdc7cd1e.tar.gz | |
(cvs-mode-marked): Set up the default for CMD manually.
Diffstat (limited to 'lisp/pcvs.el')
| -rw-r--r-- | lisp/pcvs.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/pcvs.el b/lisp/pcvs.el index f9d444aa2a9..6ee5b3adf76 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -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 @@ Args: &optional IGNORE-MARKS IGNORE-CONTENTS." (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 @@ Only files for which FILTER is applicable are returned. 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 @@ If FILE is non-nil, directory entries won't be selected." (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))) |