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

(Fcolor_distance): Don't continue checking a color for errors after it has been

Browse source 
correctly parsed as an RGB list.
This commit is contained in:
Juanma Barranquero 2007-02-14 15:47:51 +00:00
parent 22bbca614f
commit 6c8e1d625c
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xfaces.c
View file

@ -5348,13 +5348,11 @@ If FRAME is unspecified or nil, the current frame is used. */)
CHECK_LIVE_FRAME (frame);
f = XFRAME (frame);
if ((CONSP (color1) && !parse_rgb_list (color1, &cdef1))
|| !STRINGP (color1)
|| !defined_color (f, SDATA (color1), &cdef1, 0))
if (!(CONSP (color1) && parse_rgb_list (color1, &cdef1))
&& !(STRINGP (color1) && defined_color (f, SDATA (color1), &cdef1, 0)))
signal_error ("Invalid color", color1);
if ((CONSP (color2) && !parse_rgb_list (color2, &cdef2))
|| !STRINGP (color2)
|| !defined_color (f, SDATA (color2), &cdef2, 0))
if (!(CONSP (color2) && parse_rgb_list (color2, &cdef2))
&& !(STRINGP (color2) && defined_color (f, SDATA (color2), &cdef2, 0)))
signal_error ("Invalid color", color2);
return make_number (color_distance (&cdef1, &cdef2));