Mercurial > emacs
changeset 37220:bd650fe3380e
(widget-color-sample-face-get): Don't make
faces for undefined colors.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Thu, 05 Apr 2001 15:57:16 +0000 |
parents | 78542938ed28 |
children | c7b04ad5ac04 |
files | lisp/wid-edit.el |
diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/wid-edit.el Thu Apr 05 14:59:37 2001 +0000 +++ b/lisp/wid-edit.el Thu Apr 05 15:57:16 2001 +0000 @@ -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 <abraham@dina.kvl.dk> ;; Maintainer: FSF @@ -3398,11 +3398,13 @@ (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."