From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Fri, 1 Aug 2008 15:33:15 +0000 (+0000)
Subject: commit patch to x-load-color-file posted by lekktu@gmail.com
X-Git-Tag: emacs-pretest-23.0.90~3718
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebadbfa6e794fbd089b9f21dc82519b0816f5c02;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 19877ab7314..0e7c4b9a885 100644
--- 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 4d49d9a8f7c..e2d2ec652c6 100644
--- 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);
 	  }
       }