commit patch to x-load-color-file posted by lekktu@gmail.com

diff --git a/src/ChangeLog b/src/ChangeLog
index 19877ab73140ae8babc5b499df69521010add049..0e7c4b9a885ec06e80a1fba3d5b52e51f2da4041 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-01  Juanma Barranquero  <lekktu@gmail.com>
+
+       * xfaces.c (x-load-color-file): Use RGB() instead of manually shifting
+       on Windows.
+
 2008-08-01  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
        Warning clearing and clean-up in NS port.

diff --git a/src/xfaces.c b/src/xfaces.c
index 4d49d9a8f7c4d19aad9316841ae1bf098d0fe1be..e2d2ec652c6014d1d9950c694610c32735f0888c 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6600,7 +6600,11 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string.  */)
            if (name[num] == '\n')
              name[num] = 0;
            cmap = Fcons (Fcons (build_string (name),
-                                make_number ((red << 16) | (green << 8) | blue)),
+#ifdef WINDOWS_NT
+                                make_number (RGB (red, green, blue))),
+#else
+                               make_number ((red << 16) | (green << 8) | blue)),
+#endif
                          cmap);
          }
       }