procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(load_color): Call defined_color to allocate the color.

Browse source
This commit is contained in:
Richard M. Stallman 1995-03-06 04:32:25 +00:00
parent 2e52ff59e5
commit a992f9d90e
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/xfaces.c
View file

@ -340,26 +340,17 @@ load_color (f, name)
struct frame *f;
Lisp_Object name;
{
Display *dpy = FRAME_X_DISPLAY (f);
Colormap cmap;
XColor color;
int result;
if (NILP (name))
return FACE_DEFAULT;
cmap = DefaultColormapOfScreen (DefaultScreenOfDisplay (dpy));
CHECK_STRING (name, 0);
BLOCK_INPUT;
result = XParseColor (dpy, cmap, (char *) XSTRING (name)->data, &color);
UNBLOCK_INPUT;
result = defined_color(f, (char *) XSTRING (name)->data, &color, 1);
if (! result)
Fsignal (Qerror, Fcons (build_string ("undefined color"),
Fcons (name, Qnil)));
BLOCK_INPUT;
result = XAllocColor (dpy, cmap, &color);
UNBLOCK_INPUT;
/* Ignore the return value of XallocColor, so that
we use a color close to the one requested
if we can't get the exact request. */