Mercurial > emacs
comparison lisp/facemenu.el @ 96675:d45acf0c8d23
merging Emacs.app (NeXTstep port)
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Tue, 15 Jul 2008 18:15:18 +0000 |
| parents | ee5932bf781d |
| children | d42aff5ca541 |
comparison
equal
deleted
inserted
replaced
| 96674:ff312a846b25 | 96675:d45acf0c8d23 |
|---|---|
| 458 start end '(invisible nil intangible nil read-only nil)))) | 458 start end '(invisible nil intangible nil read-only nil)))) |
| 459 | 459 |
| 460 (defun facemenu-read-color (&optional prompt) | 460 (defun facemenu-read-color (&optional prompt) |
| 461 "Read a color using the minibuffer." | 461 "Read a color using the minibuffer." |
| 462 (let* ((completion-ignore-case t) | 462 (let* ((completion-ignore-case t) |
| 463 (require-match (not (eq window-system 'ns))) | |
| 463 (col (completing-read (or prompt "Color: ") | 464 (col (completing-read (or prompt "Color: ") |
| 464 (or facemenu-color-alist | 465 (or facemenu-color-alist |
| 465 (defined-colors)) | 466 (defined-colors)) |
| 466 nil t))) | 467 nil require-match))) |
| 467 (if (equal "" col) | 468 (if (equal "" col) |
| 468 nil | 469 nil |
| 469 col))) | 470 col))) |
| 470 | 471 |
| 471 (defun list-colors-display (&optional list buffer-name) | 472 (defun list-colors-display (&optional list buffer-name) |