# HG changeset patch # User Kim F. Storm # Date 1156548784 0 # Node ID 892ea79efee690762e588a84c2546da1af3c8825 # Parent cea6e823a9c3988dc164a2a1f84b5e8ab4a86079 (Fxw_color_values): Simplify; use list3. diff -r cea6e823a9c3 -r 892ea79efee6 src/macfns.c --- a/src/macfns.c Fri Aug 25 23:32:17 2006 +0000 +++ b/src/macfns.c Fri Aug 25 23:33:04 2006 +0000 @@ -2876,14 +2876,9 @@ 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; } diff -r cea6e823a9c3 -r 892ea79efee6 src/w32fns.c --- a/src/w32fns.c Fri Aug 25 23:32:17 2006 +0000 +++ b/src/w32fns.c Fri Aug 25 23:33:04 2006 +0000 @@ -6355,17 +6355,12 @@ 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; } diff -r cea6e823a9c3 -r 892ea79efee6 src/xfns.c --- a/src/xfns.c Fri Aug 25 23:32:17 2006 +0000 +++ b/src/xfns.c Fri Aug 25 23:33:04 2006 +0000 @@ -3475,14 +3475,9 @@ 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; }