Mercurial > emacs
changeset 97200:d53d10659659
commit patch to x-load-color-file posted by lekktu@gmail.com
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Fri, 01 Aug 2008 15:33:15 +0000 |
| parents | 1aaeadd306da |
| children | 2ef456c39196 |
| files | src/ChangeLog src/xfaces.c |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Aug 01 14:04:53 2008 +0000 +++ b/src/ChangeLog Fri Aug 01 15:33:15 2008 +0000 @@ -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.
--- a/src/xfaces.c Fri Aug 01 14:04:53 2008 +0000 +++ b/src/xfaces.c Fri Aug 01 15:33:15 2008 +0000 @@ -6600,7 +6600,11 @@ 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); } }