diff options
| author | Andrew Choi | 2003-01-28 17:30:12 +0000 |
|---|---|---|
| committer | Andrew Choi | 2003-01-28 17:30:12 +0000 |
| commit | 385f11cf3577d72617f2cb1f863d1b80d0b202bf (patch) | |
| tree | e9db7239aa7ddadf40ec993065ebb18c8e602450 | |
| parent | d656c0bc64b5b8cc29c1e0a6809cd4b43e670811 (diff) | |
| download | emacs-385f11cf3577d72617f2cb1f863d1b80d0b202bf.tar.gz emacs-385f11cf3577d72617f2cb1f863d1b80d0b202bf.zip | |
2003-01-28 Andrew Choi <akochoi@shaw.ca>
* macfns.c (x_to_mac_color): Correct the order for parsing the RGB
values in old-style RGB specs.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/macfns.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d9cddaa611d..1b4c7807aed 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-01-28 Andrew Choi <akochoi@shaw.ca> | ||
| 2 | |||
| 3 | * macfns.c (x_to_mac_color): Correct the order for parsing the RGB | ||
| 4 | values in old-style RGB specs. | ||
| 5 | |||
| 1 | 2003-01-27 Juanma Barranquero <lektu@terra.es> | 6 | 2003-01-27 Juanma Barranquero <lektu@terra.es> |
| 2 | 7 | ||
| 3 | * w32fns.c (init_external_image_libraries): Try alternate names for the | 8 | * w32fns.c (init_external_image_libraries): Try alternate names for the |
diff --git a/src/macfns.c b/src/macfns.c index 38afebe0c91..7ae8ccb0a06 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -1837,7 +1837,7 @@ x_to_mac_color (colorname) | |||
| 1837 | { | 1837 | { |
| 1838 | unsigned long colorval; | 1838 | unsigned long colorval; |
| 1839 | int i, pos; | 1839 | int i, pos; |
| 1840 | pos = 0; | 1840 | pos = 16; |
| 1841 | size /= 3; | 1841 | size /= 3; |
| 1842 | colorval = 0; | 1842 | colorval = 0; |
| 1843 | 1843 | ||
| @@ -1873,7 +1873,7 @@ x_to_mac_color (colorname) | |||
| 1873 | break; | 1873 | break; |
| 1874 | } | 1874 | } |
| 1875 | colorval |= (value << pos); | 1875 | colorval |= (value << pos); |
| 1876 | pos += 0x8; | 1876 | pos -= 8; |
| 1877 | if (i == 2) | 1877 | if (i == 2) |
| 1878 | { | 1878 | { |
| 1879 | UNBLOCK_INPUT; | 1879 | UNBLOCK_INPUT; |