Mercurial > emacs

changeset 10919:ebae5c953523

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(load_color): Call defined_color to allocate the color.
author Richard M. Stallman <rms@gnu.org>
date Mon, 06 Mar 1995 04:32:25 +0000
parents a78b47b38c46
children bb3f9aaf0e46
files src/xfaces.c
diffstat 1 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Mon Mar 06 04:25:29 1995 +0000
+++ b/src/xfaces.c	Mon Mar 06 04:32:25 1995 +0000
@@ -340,26 +340,17 @@
      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.  */