diff options
| author | Boris Goldowsky <boris@gnu.org> | 1995-04-11 15:56:53 +0000 |
|---|---|---|
| committer | Boris Goldowsky <boris@gnu.org> | 1995-04-11 15:56:53 +0000 |
| commit | e0c31792ee00f348ede3aa092989716abe910890 (patch) | |
| tree | a65cad47e4b151a79c3bc2387bf6afdd6aa99c9a /lisp/facemenu.el | |
| parent | 8b06ac575ba7372177f7d4ebe57fb8bcb1e6fb5b (diff) | |
| download | emacs-e0c31792ee00f348ede3aa092989716abe910890.tar.gz | |
(facemenu-read-color): Don't ignore PROMPT arg. Make arg optional.
(facemenu-unlisted-faces): Add font-lock faces to default value.
Diffstat (limited to 'lisp/facemenu.el')
| -rw-r--r-- | lisp/facemenu.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 1128d84bcdb..0f7dcd99c0f 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -124,7 +124,10 @@ This should be nil to put them at the top of the menu, or t to put them just before \"Other\" at the end.") (defvar facemenu-unlisted-faces - '(modeline region secondary-selection highlight scratch-face) + '(modeline region secondary-selection highlight scratch-face + font-lock-comment-face font-lock-string-face font-lock-keyword-face + font-lock-function-name-face font-lock-variable-name-face + font-lock-type-face font-lock-reference-face) "List of faces not to include in the Face menu. Set this before loading facemenu.el, or call `facemenu-update' after changing it. @@ -375,9 +378,9 @@ This sets the `read-only' text property; it can be undone with (setq props (cdr (cdr props)))))))) ;;;###autoload -(defun facemenu-read-color (prompt) +(defun facemenu-read-color (&optional prompt) "Read a color using the minibuffer." - (let ((col (completing-read (or "Color: ") + (let ((col (completing-read (or prompt "Color: ") (or facemenu-color-alist (if (eq 'x window-system) (mapcar 'list (x-defined-colors)))) |