changeset 11372:874b91f4adc4

(facemenu-read-color): Don't ignore PROMPT arg. Make arg optional. (facemenu-unlisted-faces): Add font-lock faces to default value.
author Boris Goldowsky <boris@gnu.org>
date Tue, 11 Apr 1995 15:56:53 +0000
parents b945fc51a3b6
children 8381a25d021e
files lisp/facemenu.el
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/facemenu.el	Tue Apr 11 03:04:38 1995 +0000
+++ b/lisp/facemenu.el	Tue Apr 11 15:56:53 1995 +0000
@@ -124,7 +124,10 @@
 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 @@
 	  (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))))