From 95626e112bf3663c0900974609b4f1a0ab890aed Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 18 Mar 1995 18:05:28 +0000 Subject: [PATCH] (x_decode_color): Don't use cdef if defined_color failed. --- src/xfns.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 6eebc7deb0..6f3be6d696 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' -- 2.20.1