]>
Commit | Line | Data |
---|---|---|
59ab3540 AM |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.298 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.298 | |
11 | Problem: Built-in colors are different from rgb.txt. | |
12 | Solution: Adjust the color values. (Benjamin Haskell) | |
13 | Files: src/gui_photon.c, src/gui_w48.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.297/src/gui_photon.c 2011-08-10 12:19:00.000000000 +0200 | |
17 | --- src/gui_photon.c 2011-09-07 18:55:09.000000000 +0200 | |
18 | *************** | |
19 | *** 2007,2014 **** | |
20 | static GuiColourTable table[] = | |
21 | { | |
22 | {"Black", RGB(0x00, 0x00, 0x00)}, | |
23 | ! {"DarkGray", RGB(0x80, 0x80, 0x80)}, | |
24 | ! {"DarkGrey", RGB(0x80, 0x80, 0x80)}, | |
25 | {"Gray", RGB(0xC0, 0xC0, 0xC0)}, | |
26 | {"Grey", RGB(0xC0, 0xC0, 0xC0)}, | |
27 | {"LightGray", RGB(0xD3, 0xD3, 0xD3)}, | |
28 | --- 2007,2014 ---- | |
29 | static GuiColourTable table[] = | |
30 | { | |
31 | {"Black", RGB(0x00, 0x00, 0x00)}, | |
32 | ! {"DarkGray", RGB(0xA9, 0xA9, 0xA9)}, | |
33 | ! {"DarkGrey", RGB(0xA9, 0xA9, 0xA9)}, | |
34 | {"Gray", RGB(0xC0, 0xC0, 0xC0)}, | |
35 | {"Grey", RGB(0xC0, 0xC0, 0xC0)}, | |
36 | {"LightGray", RGB(0xD3, 0xD3, 0xD3)}, | |
37 | *************** | |
38 | *** 2037,2055 **** | |
39 | {"LightRed", RGB(0xFF, 0xA0, 0xA0)}, | |
40 | {"DarkBlue", RGB(0x00, 0x00, 0x80)}, | |
41 | {"Blue", RGB(0x00, 0x00, 0xFF)}, | |
42 | ! {"LightBlue", RGB(0xA0, 0xA0, 0xFF)}, | |
43 | {"DarkGreen", RGB(0x00, 0x80, 0x00)}, | |
44 | {"Green", RGB(0x00, 0xFF, 0x00)}, | |
45 | ! {"LightGreen", RGB(0xA0, 0xFF, 0xA0)}, | |
46 | {"DarkCyan", RGB(0x00, 0x80, 0x80)}, | |
47 | {"Cyan", RGB(0x00, 0xFF, 0xFF)}, | |
48 | ! {"LightCyan", RGB(0xA0, 0xFF, 0xFF)}, | |
49 | {"DarkMagenta", RGB(0x80, 0x00, 0x80)}, | |
50 | {"Magenta", RGB(0xFF, 0x00, 0xFF)}, | |
51 | {"LightMagenta", RGB(0xFF, 0xA0, 0xFF)}, | |
52 | {"Brown", RGB(0x80, 0x40, 0x40)}, | |
53 | {"Yellow", RGB(0xFF, 0xFF, 0x00)}, | |
54 | ! {"LightYellow", RGB(0xFF, 0xFF, 0xA0)}, | |
55 | {"SeaGreen", RGB(0x2E, 0x8B, 0x57)}, | |
56 | {"Orange", RGB(0xFF, 0xA5, 0x00)}, | |
57 | {"Purple", RGB(0xA0, 0x20, 0xF0)}, | |
58 | --- 2037,2055 ---- | |
59 | {"LightRed", RGB(0xFF, 0xA0, 0xA0)}, | |
60 | {"DarkBlue", RGB(0x00, 0x00, 0x80)}, | |
61 | {"Blue", RGB(0x00, 0x00, 0xFF)}, | |
62 | ! {"LightBlue", RGB(0xAD, 0xD8, 0xE6)}, | |
63 | {"DarkGreen", RGB(0x00, 0x80, 0x00)}, | |
64 | {"Green", RGB(0x00, 0xFF, 0x00)}, | |
65 | ! {"LightGreen", RGB(0x90, 0xEE, 0x90)}, | |
66 | {"DarkCyan", RGB(0x00, 0x80, 0x80)}, | |
67 | {"Cyan", RGB(0x00, 0xFF, 0xFF)}, | |
68 | ! {"LightCyan", RGB(0xE0, 0xFF, 0xFF)}, | |
69 | {"DarkMagenta", RGB(0x80, 0x00, 0x80)}, | |
70 | {"Magenta", RGB(0xFF, 0x00, 0xFF)}, | |
71 | {"LightMagenta", RGB(0xFF, 0xA0, 0xFF)}, | |
72 | {"Brown", RGB(0x80, 0x40, 0x40)}, | |
73 | {"Yellow", RGB(0xFF, 0xFF, 0x00)}, | |
74 | ! {"LightYellow", RGB(0xFF, 0xFF, 0xE0)}, | |
75 | {"SeaGreen", RGB(0x2E, 0x8B, 0x57)}, | |
76 | {"Orange", RGB(0xFF, 0xA5, 0x00)}, | |
77 | {"Purple", RGB(0xA0, 0x20, 0xF0)}, | |
78 | *** ../vim-7.3.297/src/gui_w48.c 2011-08-10 17:07:56.000000000 +0200 | |
79 | --- src/gui_w48.c 2011-09-07 18:55:09.000000000 +0200 | |
80 | *************** | |
81 | *** 1411,1422 **** | |
82 | static guicolor_tTable table[] = | |
83 | { | |
84 | {"Black", RGB(0x00, 0x00, 0x00)}, | |
85 | ! {"DarkGray", RGB(0x80, 0x80, 0x80)}, | |
86 | ! {"DarkGrey", RGB(0x80, 0x80, 0x80)}, | |
87 | {"Gray", RGB(0xC0, 0xC0, 0xC0)}, | |
88 | {"Grey", RGB(0xC0, 0xC0, 0xC0)}, | |
89 | ! {"LightGray", RGB(0xE0, 0xE0, 0xE0)}, | |
90 | ! {"LightGrey", RGB(0xE0, 0xE0, 0xE0)}, | |
91 | {"Gray10", RGB(0x1A, 0x1A, 0x1A)}, | |
92 | {"Grey10", RGB(0x1A, 0x1A, 0x1A)}, | |
93 | {"Gray20", RGB(0x33, 0x33, 0x33)}, | |
94 | --- 1411,1422 ---- | |
95 | static guicolor_tTable table[] = | |
96 | { | |
97 | {"Black", RGB(0x00, 0x00, 0x00)}, | |
98 | ! {"DarkGray", RGB(0xA9, 0xA9, 0xA9)}, | |
99 | ! {"DarkGrey", RGB(0xA9, 0xA9, 0xA9)}, | |
100 | {"Gray", RGB(0xC0, 0xC0, 0xC0)}, | |
101 | {"Grey", RGB(0xC0, 0xC0, 0xC0)}, | |
102 | ! {"LightGray", RGB(0xD3, 0xD3, 0xD3)}, | |
103 | ! {"LightGrey", RGB(0xD3, 0xD3, 0xD3)}, | |
104 | {"Gray10", RGB(0x1A, 0x1A, 0x1A)}, | |
105 | {"Grey10", RGB(0x1A, 0x1A, 0x1A)}, | |
106 | {"Gray20", RGB(0x33, 0x33, 0x33)}, | |
107 | *************** | |
108 | *** 1441,1459 **** | |
109 | {"LightRed", RGB(0xFF, 0xA0, 0xA0)}, | |
110 | {"DarkBlue", RGB(0x00, 0x00, 0x80)}, | |
111 | {"Blue", RGB(0x00, 0x00, 0xFF)}, | |
112 | ! {"LightBlue", RGB(0xA0, 0xA0, 0xFF)}, | |
113 | {"DarkGreen", RGB(0x00, 0x80, 0x00)}, | |
114 | {"Green", RGB(0x00, 0xFF, 0x00)}, | |
115 | ! {"LightGreen", RGB(0xA0, 0xFF, 0xA0)}, | |
116 | {"DarkCyan", RGB(0x00, 0x80, 0x80)}, | |
117 | {"Cyan", RGB(0x00, 0xFF, 0xFF)}, | |
118 | ! {"LightCyan", RGB(0xA0, 0xFF, 0xFF)}, | |
119 | {"DarkMagenta", RGB(0x80, 0x00, 0x80)}, | |
120 | {"Magenta", RGB(0xFF, 0x00, 0xFF)}, | |
121 | {"LightMagenta", RGB(0xFF, 0xA0, 0xFF)}, | |
122 | {"Brown", RGB(0x80, 0x40, 0x40)}, | |
123 | {"Yellow", RGB(0xFF, 0xFF, 0x00)}, | |
124 | ! {"LightYellow", RGB(0xFF, 0xFF, 0xA0)}, | |
125 | {"DarkYellow", RGB(0xBB, 0xBB, 0x00)}, | |
126 | {"SeaGreen", RGB(0x2E, 0x8B, 0x57)}, | |
127 | {"Orange", RGB(0xFF, 0xA5, 0x00)}, | |
128 | --- 1441,1459 ---- | |
129 | {"LightRed", RGB(0xFF, 0xA0, 0xA0)}, | |
130 | {"DarkBlue", RGB(0x00, 0x00, 0x80)}, | |
131 | {"Blue", RGB(0x00, 0x00, 0xFF)}, | |
132 | ! {"LightBlue", RGB(0xAD, 0xD8, 0xE6)}, | |
133 | {"DarkGreen", RGB(0x00, 0x80, 0x00)}, | |
134 | {"Green", RGB(0x00, 0xFF, 0x00)}, | |
135 | ! {"LightGreen", RGB(0x90, 0xEE, 0x90)}, | |
136 | {"DarkCyan", RGB(0x00, 0x80, 0x80)}, | |
137 | {"Cyan", RGB(0x00, 0xFF, 0xFF)}, | |
138 | ! {"LightCyan", RGB(0xE0, 0xFF, 0xFF)}, | |
139 | {"DarkMagenta", RGB(0x80, 0x00, 0x80)}, | |
140 | {"Magenta", RGB(0xFF, 0x00, 0xFF)}, | |
141 | {"LightMagenta", RGB(0xFF, 0xA0, 0xFF)}, | |
142 | {"Brown", RGB(0x80, 0x40, 0x40)}, | |
143 | {"Yellow", RGB(0xFF, 0xFF, 0x00)}, | |
144 | ! {"LightYellow", RGB(0xFF, 0xFF, 0xE0)}, | |
145 | {"DarkYellow", RGB(0xBB, 0xBB, 0x00)}, | |
146 | {"SeaGreen", RGB(0x2E, 0x8B, 0x57)}, | |
147 | {"Orange", RGB(0xFF, 0xA5, 0x00)}, | |
148 | *** ../vim-7.3.297/src/version.c 2011-09-07 18:47:19.000000000 +0200 | |
149 | --- src/version.c 2011-09-07 18:55:27.000000000 +0200 | |
150 | *************** | |
151 | *** 711,712 **** | |
152 | --- 711,714 ---- | |
153 | { /* Add new patch number below this line */ | |
154 | + /**/ | |
155 | + 298, | |
156 | /**/ | |
157 | ||
158 | -- | |
159 | You can test a person's importance in the organization by asking how much RAM | |
160 | his computer has. Anybody who knows the answer to that question is not a | |
161 | decision-maker. | |
162 | (Scott Adams - The Dilbert principle) | |
163 | ||
164 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
165 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
166 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
167 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |