From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 18 Mar 1995 18:05:28 +0000 (+0000)
Subject: (x_decode_color): Don't use cdef if defined_color failed.
X-Git-Tag: emacs-19.34~4798
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95626e112bf3663c0900974609b4f1a0ab890aed;p=emacs.git

(x_decode_color): Don't use cdef if defined_color failed.
---

diff --git a/src/xfns.c b/src/xfns.c
index 6eebc7deb04..6f3be6d6966 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1069,11 +1069,13 @@ x_decode_color (f, arg, def)
   if (FRAME_X_DISPLAY_INFO (f)->n_planes == 1)
     return def;
 
-  /* Ignore the return value of defined_color so that
-     we use a color close to the one requested
-     if we can't get the exact request.  */
-  defined_color (f, XSTRING (arg)->data, &cdef, 1);
-  return cdef.pixel;
+  /* defined_color is responsible for coping with failures
+     by looking for a near-miss.  */
+  if (defined_color (f, XSTRING (arg)->data, &cdef, 1))
+    return cdef.pixel;
+
+  /* defined_color failed; return an ultimate default.  */
+  return def;
 }
 
 /* Functions called only from `x_set_frame_param'