From 76834555a8f7185f22fee6f3eb92205656ecb40d Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 5 Apr 2001 15:57:16 +0000 Subject: [PATCH] (widget-color-sample-face-get): Don't make faces for undefined colors. --- lisp/wid-edit.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index b28b52688c5..a3821dcfe0a 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -1,6 +1,6 @@ ;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*- ;; -;; Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen ;; Maintainer: FSF @@ -3398,11 +3398,13 @@ To use this type, you must define :match or :match-alternatives." (defun widget-color-sample-face-get (widget) (let* ((value (condition-case nil (widget-value widget) - (error (widget-get widget :value)))) - (symbol (intern (concat "fg:" value)))) - (condition-case nil - (facemenu-get-face symbol) - (error 'default)))) + (error (widget-get widget :value))))) + (if (color-defined-p value) + (let ((symbol (intern (concat "fg:" value)))) + (condition-case nil + (facemenu-get-face symbol) + (error 'default))) + 'default))) (defun widget-color-action (widget &optional event) "Prompt for a color." -- 2.39.5