Mercurial > emacs
comparison lisp/pcvs-util.el @ 91005:424b655804ca
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 13 Aug 2007 13:48:35 +0000 |
| parents | f55f9811f5d7 c2b062cb5942 |
| children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
| 91004:f72cf5b2ab11 | 91005:424b655804ca |
|---|---|
| 209 | 209 |
| 210 | 210 |
| 211 (defconst cvs-qtypedesc-string1 (cvs-qtypedesc-create 'identity 'identity t)) | 211 (defconst cvs-qtypedesc-string1 (cvs-qtypedesc-create 'identity 'identity t)) |
| 212 (defconst cvs-qtypedesc-string (cvs-qtypedesc-create 'identity 'identity)) | 212 (defconst cvs-qtypedesc-string (cvs-qtypedesc-create 'identity 'identity)) |
| 213 (defconst cvs-qtypedesc-strings | 213 (defconst cvs-qtypedesc-strings |
| 214 (cvs-qtypedesc-create 'string->strings 'strings->string nil)) | 214 (cvs-qtypedesc-create 'split-string-and-unquote |
| 215 'combine-and-quote-strings nil)) | |
| 215 | 216 |
| 216 (defun cvs-query-read (default prompt qtypedesc &optional hist-sym) | 217 (defun cvs-query-read (default prompt qtypedesc &optional hist-sym) |
| 217 (let* ((qtypedesc (or qtypedesc cvs-qtypedesc-strings)) | 218 (let* ((qtypedesc (or qtypedesc cvs-qtypedesc-strings)) |
| 218 (hist-sym (or hist-sym (cvs-qtypedesc-hist-sym qtypedesc))) | 219 (hist-sym (or hist-sym (cvs-qtypedesc-hist-sym qtypedesc))) |
| 219 (complete (cvs-qtypedesc-complete qtypedesc)) | 220 (complete (cvs-qtypedesc-complete qtypedesc)) |