Mercurial > emacs
comparison lisp/facemenu.el @ 90201:fbb2bea03df9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 14 Jul 2005 08:02:00 +0000 |
| parents | f9a65d7ebd29 11c1d62f46ae |
| children | 2d92f5c9d6ae |
comparison
equal
deleted
inserted
replaced
| 90200:f9a65d7ebd29 | 90201:fbb2bea03df9 |
|---|---|
| 473 start end '(invisible nil intangible nil read-only nil)))) | 473 start end '(invisible nil intangible nil read-only nil)))) |
| 474 | 474 |
| 475 ;;;###autoload | 475 ;;;###autoload |
| 476 (defun facemenu-read-color (&optional prompt) | 476 (defun facemenu-read-color (&optional prompt) |
| 477 "Read a color using the minibuffer." | 477 "Read a color using the minibuffer." |
| 478 (let ((col (completing-read (or prompt "Color: ") | 478 (let* ((completion-ignore-case t) |
| 479 (or facemenu-color-alist | 479 (col (completing-read (or prompt "Color: ") |
| 480 (defined-colors)) | 480 (or facemenu-color-alist |
| 481 nil t))) | 481 (defined-colors)) |
| 482 nil t))) | |
| 482 (if (equal "" col) | 483 (if (equal "" col) |
| 483 nil | 484 nil |
| 484 col))) | 485 col))) |
| 485 | 486 |
| 486 ;;;###autoload | 487 ;;;###autoload |