diff options
| author | Karoly Lorentey <[email protected]> | 2005-10-09 20:00:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-10-09 20:00:17 +0000 |
| commit | 0ff21b4e57b1dc7c714c21c9eea1a4906630ecf2 (patch) | |
| tree | 3e8596405b243531128cd0f1d8f59d2ab9e7f7c7 /lisp/vc-mcvs.el | |
| parent | a3c07f683d1f9fbf7c7af0120dfebc5fc34b61fa (diff) | |
| parent | 20ef86730cca82a1a2e212a665c0b119ed2d70b2 (diff) | |
Merged from [email protected] (patch 118-132, 551-577)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-551
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-552
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-553
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-554
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-555
Remove CVS keywords from newsticker files
* [email protected]/emacs--cvs-trunk--0--patch-556
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-557
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-558
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-559
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-560
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-561
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-562
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-563
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-564
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-565
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-566
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-567
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-568
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-569
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-570
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-571
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-572
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-573
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-574
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-575
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-576
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-577
Update from CVS
* [email protected]/gnus--rel--5.10--patch-118
Update from CVS
* [email protected]/gnus--rel--5.10--patch-119
Update from CVS
* [email protected]/gnus--rel--5.10--patch-120
Update from CVS
* [email protected]/gnus--rel--5.10--patch-121
Merge from emacs--cvs-trunk--0
* [email protected]/gnus--rel--5.10--patch-122
Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
* [email protected]/gnus--rel--5.10--patch-123
Update from CVS
* [email protected]/gnus--rel--5.10--patch-124
Update from CVS
* [email protected]/gnus--rel--5.10--patch-125
Merge from emacs--cvs-trunk--0
* [email protected]/gnus--rel--5.10--patch-126
Update from CVS
* [email protected]/gnus--rel--5.10--patch-127
Update from CVS
* [email protected]/gnus--rel--5.10--patch-128
Update from CVS
* [email protected]/gnus--rel--5.10--patch-129
Update from CVS
* [email protected]/gnus--rel--5.10--patch-130
Update from CVS
* [email protected]/gnus--rel--5.10--patch-131
Merge from emacs--cvs-trunk--0
* [email protected]/gnus--rel--5.10--patch-132
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-423
Diffstat (limited to 'lisp/vc-mcvs.el')
| -rw-r--r-- | lisp/vc-mcvs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index 271cd01cbf..b52bc797dd 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -225,7 +225,7 @@ the Meta-CVS command (in that order)." ;; Make sure the `mcvs add' will not fire up the CVSEDITOR ;; to add a rule for the given file's extension. (when (and ext (not (assoc ext types))) - (let ((type (completing-read "Type to use [default]: " + (let ((type (completing-read "Type to use (default): " '("default" "name-only" "keep-old" "binary" "value-only") nil t nil nil "default"))) |