Commit 78d116b
committed
Add php-core.el for the dependency-free primitives
php.el is required by every PHP package, but it requires flymake,
php-project and (for now) CC Mode. A module that only wants the `php'
customization group or a syntax-ppss predicate pays for all of it:
`(require 'php)' pulls in 17 features and ~53 ms.
Move the definitions that depend on nothing into php-core.el:
- the `php' customization group,
- `php-executable',
- `php-in-string-p' and its siblings,
- `php-base-mode'.
php.el requires php-core.el and therefore still exposes all of them, so
`(require 'php)' behaves exactly as before and nothing has to migrate.
php-indent.el, which only ever wanted the customization group, now
requires php-core.el instead: 2 features and ~1 ms, with no flymake,
php-project or cc-engine in its dependency chain.
Two consequences worth noting:
* php.el's defcustoms specify `:group 'php' again. #813 removed those
as redundant, which was true only while the defgroup sat in the same
file: `custom-current-group' keys off `load-file-name', so with the
defgroup in php-core.el they would silently fall out of the group
(`M-x customize-group php' listed 2 members instead of 29). They are
required now, not redundant.
* The syntax tables stay in php.el for the moment. They are built with
`c-populate-syntax-table', so moving them would drag CC Mode into
php-core.el and defeat the purpose; they can follow once php.el stops
requiring cc-engine.
Verified that (get GROUP 'custom-group) membership is identical to
before for every php* group.1 parent 22e5c80 commit 78d116b
4 files changed
Lines changed: 119 additions & 42 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | 45 | | |
58 | 46 | | |
| 47 | + | |
59 | 48 | | |
60 | 49 | | |
61 | 50 | | |
62 | 51 | | |
63 | 52 | | |
| 53 | + | |
64 | 54 | | |
65 | 55 | | |
66 | 56 | | |
67 | 57 | | |
68 | 58 | | |
69 | 59 | | |
70 | 60 | | |
| 61 | + | |
71 | 62 | | |
72 | 63 | | |
73 | 64 | | |
74 | 65 | | |
75 | 66 | | |
76 | 67 | | |
| 68 | + | |
77 | 69 | | |
78 | 70 | | |
79 | 71 | | |
| |||
89 | 81 | | |
90 | 82 | | |
91 | 83 | | |
| 84 | + | |
92 | 85 | | |
93 | 86 | | |
94 | 87 | | |
95 | 88 | | |
96 | 89 | | |
97 | 90 | | |
| 91 | + | |
98 | 92 | | |
99 | 93 | | |
100 | 94 | | |
101 | 95 | | |
| 96 | + | |
102 | 97 | | |
103 | 98 | | |
104 | 99 | | |
105 | 100 | | |
| 101 | + | |
106 | 102 | | |
107 | 103 | | |
108 | 104 | | |
| |||
113 | 109 | | |
114 | 110 | | |
115 | 111 | | |
| 112 | + | |
116 | 113 | | |
117 | 114 | | |
118 | 115 | | |
| |||
157 | 154 | | |
158 | 155 | | |
159 | 156 | | |
| 157 | + | |
160 | 158 | | |
161 | 159 | | |
162 | 160 | | |
163 | 161 | | |
| 162 | + | |
164 | 163 | | |
165 | 164 | | |
166 | 165 | | |
167 | 166 | | |
| 167 | + | |
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
| 173 | + | |
173 | 174 | | |
174 | 175 | | |
175 | 176 | | |
176 | 177 | | |
177 | 178 | | |
| 179 | + | |
178 | 180 | | |
179 | 181 | | |
180 | 182 | | |
| |||
183 | 185 | | |
184 | 186 | | |
185 | 187 | | |
| 188 | + | |
186 | 189 | | |
187 | 190 | | |
188 | 191 | | |
189 | 192 | | |
190 | 193 | | |
191 | 194 | | |
192 | 195 | | |
| 196 | + | |
193 | 197 | | |
194 | 198 | | |
195 | 199 | | |
196 | 200 | | |
197 | 201 | | |
| 202 | + | |
198 | 203 | | |
199 | 204 | | |
200 | 205 | | |
201 | 206 | | |
202 | 207 | | |
203 | 208 | | |
204 | 209 | | |
| 210 | + | |
205 | 211 | | |
206 | 212 | | |
207 | 213 | | |
208 | 214 | | |
209 | 215 | | |
| 216 | + | |
210 | 217 | | |
211 | 218 | | |
212 | 219 | | |
213 | 220 | | |
214 | 221 | | |
| 222 | + | |
215 | 223 | | |
216 | 224 | | |
217 | 225 | | |
218 | 226 | | |
219 | 227 | | |
| 228 | + | |
220 | 229 | | |
221 | 230 | | |
222 | 231 | | |
| |||
239 | 248 | | |
240 | 249 | | |
241 | 250 | | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | | - | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | | - | |
262 | 251 | | |
263 | 252 | | |
264 | 253 | | |
| |||
451 | 440 | | |
452 | 441 | | |
453 | 442 | | |
| 443 | + | |
454 | 444 | | |
455 | 445 | | |
456 | 446 | | |
| |||
599 | 589 | | |
600 | 590 | | |
601 | 591 | | |
| 592 | + | |
602 | 593 | | |
603 | 594 | | |
604 | 595 | | |
| |||
653 | 644 | | |
654 | 645 | | |
655 | 646 | | |
656 | | - | |
657 | | - | |
658 | | - | |
659 | | - | |
660 | | - | |
661 | | - | |
662 | | - | |
663 | | - | |
664 | 647 | | |
665 | 648 | | |
666 | 649 | | |
| |||
0 commit comments