From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 6 Mar 1995 04:32:25 +0000 (+0000)
Subject: (load_color): Call defined_color to allocate the color.
X-Git-Tag: emacs-19.34~4939
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a992f9d90e608bbd92c7db5a797f6d799f56e7c6;p=emacs.git

(load_color): Call defined_color to allocate the color.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 2b235e0c0c3..5fe6d2092c5 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -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.  */