Mercurial > emacs
comparison lisp/gnus/gnus-util.el @ 90233:ee12d75eb214
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 556-561)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 122-124)
- Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 25 Sep 2005 22:07:01 +0000 |
parents | a3716f7538f2 c16795de963a |
children | aa89c814f853 |
comparison
equal
deleted
inserted
replaced
90232:eab32348047a | 90233:ee12d75eb214 |
---|---|
333 (pop plist))))) | 333 (pop plist))))) |
334 | 334 |
335 (defun gnus-completing-read-with-default (default prompt &rest args) | 335 (defun gnus-completing-read-with-default (default prompt &rest args) |
336 ;; Like `completing-read', except that DEFAULT is the default argument. | 336 ;; Like `completing-read', except that DEFAULT is the default argument. |
337 (let* ((prompt (if default | 337 (let* ((prompt (if default |
338 (concat prompt " (default " default ") ") | 338 (concat prompt " (default " default "): ") |
339 (concat prompt " "))) | 339 (concat prompt ": "))) |
340 (answer (apply 'completing-read prompt args))) | 340 (answer (apply 'completing-read prompt args))) |
341 (if (or (null answer) (zerop (length answer))) | 341 (if (or (null answer) (zerop (length answer))) |
342 default | 342 default |
343 answer))) | 343 answer))) |
344 | 344 |