Commit a508663b authored by Kim F. Storm's avatar Kim F. Storm

(Fxw_color_values): Simplify; use list3.

parent d489b9c5
......@@ -2876,14 +2876,9 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
CHECK_STRING (color);
if (mac_defined_color (f, SDATA (color), &foo, 0))
{
Lisp_Object rgb[3];
rgb[0] = make_number (foo.red);
rgb[1] = make_number (foo.green);
rgb[2] = make_number (foo.blue);
return Flist (3, rgb);
}
return list3 (make_number (foo.red),
make_number (foo.green),
make_number (foo.blue));
else
return Qnil;
}
......
......@@ -6355,17 +6355,12 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
CHECK_STRING (color);
if (w32_defined_color (f, SDATA (color), &foo, 0))
{
Lisp_Object rgb[3];
rgb[0] = make_number ((GetRValue (foo.pixel) << 8)
| GetRValue (foo.pixel));
rgb[1] = make_number ((GetGValue (foo.pixel) << 8)
| GetGValue (foo.pixel));
rgb[2] = make_number ((GetBValue (foo.pixel) << 8)
| GetBValue (foo.pixel));
return Flist (3, rgb);
}
return list3 (make_number ((GetRValue (foo.pixel) << 8)
| GetRValue (foo.pixel)),
make_number ((GetGValue (foo.pixel) << 8)
| GetGValue (foo.pixel)),
make_number ((GetBValue (foo.pixel) << 8)
| GetBValue (foo.pixel)));
else
return Qnil;
}
......
......@@ -3475,14 +3475,9 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
CHECK_STRING (color);
if (x_defined_color (f, SDATA (color), &foo, 0))
{
Lisp_Object rgb[3];
rgb[0] = make_number (foo.red);
rgb[1] = make_number (foo.green);
rgb[2] = make_number (foo.blue);
return Flist (3, rgb);
}
return list3 (make_number (foo.red),
make_number (foo.green),
make_number (foo.blue));
else
return Qnil;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment