]>
Commit | Line | Data |
---|---|---|
c6060300 MT |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.154 | |
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.154 (after 7.3.148) | |
11 | Problem: Can't compile with tiny features. (Tony Mechelynck) | |
12 | Solution: Move #define outside of #ifdef. | |
13 | Files: src/syntax.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.153/src/syntax.c 2011-04-01 14:44:54.000000000 +0200 | |
17 | --- src/syntax.c 2011-04-02 15:11:47.000000000 +0200 | |
18 | *************** | |
19 | *** 68,73 **** | |
20 | --- 68,75 ---- | |
21 | ||
22 | #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data))) | |
23 | ||
24 | + #define MAX_HL_ID 20000 /* maximum value for a highlight ID. */ | |
25 | + | |
26 | #ifdef FEAT_CMDL_COMPL | |
27 | /* Flags to indicate an additional string for highlight name completion. */ | |
28 | static int include_none = 0; /* when 1 include "None" */ | |
29 | *************** | |
30 | *** 225,236 **** | |
31 | * 22000 - 22999 CONTAINED indicator (current_syn_inc_tag added) | |
32 | * 23000 - 32767 cluster IDs (subtract SYNID_CLUSTER for the cluster ID) | |
33 | */ | |
34 | ! #define SYNID_ALLBUT 20000 /* syntax group ID for contains=ALLBUT */ | |
35 | #define SYNID_TOP 21000 /* syntax group ID for contains=TOP */ | |
36 | #define SYNID_CONTAINED 22000 /* syntax group ID for contains=CONTAINED */ | |
37 | #define SYNID_CLUSTER 23000 /* first syntax group ID for clusters */ | |
38 | ||
39 | - #define MAX_SYNID SYNID_ALLBUT | |
40 | #define MAX_SYN_INC_TAG 999 /* maximum before the above overflow */ | |
41 | #define MAX_CLUSTER_ID (32767 - SYNID_CLUSTER) | |
42 | ||
43 | --- 227,237 ---- | |
44 | * 22000 - 22999 CONTAINED indicator (current_syn_inc_tag added) | |
45 | * 23000 - 32767 cluster IDs (subtract SYNID_CLUSTER for the cluster ID) | |
46 | */ | |
47 | ! #define SYNID_ALLBUT MAX_HL_ID /* syntax group ID for contains=ALLBUT */ | |
48 | #define SYNID_TOP 21000 /* syntax group ID for contains=TOP */ | |
49 | #define SYNID_CONTAINED 22000 /* syntax group ID for contains=CONTAINED */ | |
50 | #define SYNID_CLUSTER 23000 /* first syntax group ID for clusters */ | |
51 | ||
52 | #define MAX_SYN_INC_TAG 999 /* maximum before the above overflow */ | |
53 | #define MAX_CLUSTER_ID (32767 - SYNID_CLUSTER) | |
54 | ||
55 | *************** | |
56 | *** 6462,6468 **** | |
57 | ||
58 | #endif /* FEAT_SYN_HL */ | |
59 | ||
60 | - | |
61 | /************************************** | |
62 | * Highlighting stuff * | |
63 | **************************************/ | |
64 | --- 6463,6468 ---- | |
65 | *************** | |
66 | *** 8996,9004 **** | |
67 | highlight_ga.ga_growsize = 10; | |
68 | } | |
69 | ||
70 | ! if (highlight_ga.ga_len >= MAX_SYNID) | |
71 | { | |
72 | ! EMSG(_("E849: Too many syntax groups")); | |
73 | vim_free(name); | |
74 | return 0; | |
75 | } | |
76 | --- 8996,9004 ---- | |
77 | highlight_ga.ga_growsize = 10; | |
78 | } | |
79 | ||
80 | ! if (highlight_ga.ga_len >= MAX_HL_ID) | |
81 | { | |
82 | ! EMSG(_("E849: Too many highlight and syntax groups")); | |
83 | vim_free(name); | |
84 | return 0; | |
85 | } | |
86 | *** ../vim-7.3.153/src/version.c 2011-04-02 14:44:50.000000000 +0200 | |
87 | --- src/version.c 2011-04-02 14:52:33.000000000 +0200 | |
88 | *************** | |
89 | *** 716,717 **** | |
90 | --- 716,719 ---- | |
91 | { /* Add new patch number below this line */ | |
92 | + /**/ | |
93 | + 154, | |
94 | /**/ | |
95 | ||
96 | -- | |
97 | BEDEVERE: Why do you think she is a witch? | |
98 | SECOND VILLAGER: She turned me into a newt. | |
99 | BEDEVERE: A newt? | |
100 | SECOND VILLAGER: (After looking at himself for some time) I got better. | |
101 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
102 | ||
103 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
104 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
105 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
106 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |