]>
Commit | Line | Data |
---|---|---|
ef75664d AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.247 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.247 | |
11 | Problem: When using Netbeans backspacing in Insert mode skips a character | |
12 | now and then. (Ankit Jain) | |
13 | Solution: Avoid calling netbeans_removed(), it frees the line pointer. | |
14 | (partly by Dominique Pelle). | |
15 | Files: src/misc1.c | |
16 | ||
17 | ||
18 | *** ../vim-7.1.246/src/misc1.c Sat Jan 19 15:55:51 2008 | |
19 | --- src/misc1.c Wed Feb 13 10:56:16 2008 | |
20 | *************** | |
21 | *** 2270,2282 **** | |
22 | /* | |
23 | * If the old line has been allocated the deletion can be done in the | |
24 | * existing line. Otherwise a new line has to be allocated | |
25 | */ | |
26 | - was_alloced = ml_line_alloced(); /* check if oldp was allocated */ | |
27 | #ifdef FEAT_NETBEANS_INTG | |
28 | ! if (was_alloced && usingNetbeans) | |
29 | ! netbeans_removed(curbuf, lnum, col, count); | |
30 | ! /* else is handled by ml_replace() */ | |
31 | #endif | |
32 | if (was_alloced) | |
33 | newp = oldp; /* use same allocated memory */ | |
34 | else | |
35 | --- 2270,2285 ---- | |
36 | /* | |
37 | * If the old line has been allocated the deletion can be done in the | |
38 | * existing line. Otherwise a new line has to be allocated | |
39 | + * Can't do this when using Netbeans, because we would need to invoke | |
40 | + * netbeans_removed(), which deallocates the line. Let ml_replace() take | |
41 | + * care of notifiying Netbeans. | |
42 | */ | |
43 | #ifdef FEAT_NETBEANS_INTG | |
44 | ! if (usingNetbeans) | |
45 | ! was_alloced = FALSE; | |
46 | ! else | |
47 | #endif | |
48 | + was_alloced = ml_line_alloced(); /* check if oldp was allocated */ | |
49 | if (was_alloced) | |
50 | newp = oldp; /* use same allocated memory */ | |
51 | else | |
52 | *************** | |
53 | *** 3978,3984 **** | |
54 | /* remove trailing path separator */ | |
55 | #ifndef MACOS_CLASSIC | |
56 | /* With MacOS path (with colons) the final colon is required */ | |
57 | ! /* to avoid confusion between absoulute and relative path */ | |
58 | if (pend > p && after_pathsep(p, pend)) | |
59 | --pend; | |
60 | #endif | |
61 | --- 3981,3987 ---- | |
62 | /* remove trailing path separator */ | |
63 | #ifndef MACOS_CLASSIC | |
64 | /* With MacOS path (with colons) the final colon is required */ | |
65 | ! /* to avoid confusion between absolute and relative path */ | |
66 | if (pend > p && after_pathsep(p, pend)) | |
67 | --pend; | |
68 | #endif | |
69 | *************** | |
70 | *** 5689,5695 **** | |
71 | else if (lookfor_ctor_init || class_or_struct) | |
72 | { | |
73 | /* we have something found, that looks like the start of | |
74 | ! * cpp-base-class-declaration or contructor-initialization */ | |
75 | cpp_base_class = TRUE; | |
76 | lookfor_ctor_init = class_or_struct = FALSE; | |
77 | *col = 0; | |
78 | --- 5692,5698 ---- | |
79 | else if (lookfor_ctor_init || class_or_struct) | |
80 | { | |
81 | /* we have something found, that looks like the start of | |
82 | ! * cpp-base-class-declaration or constructor-initialization */ | |
83 | cpp_base_class = TRUE; | |
84 | lookfor_ctor_init = class_or_struct = FALSE; | |
85 | *col = 0; | |
86 | *************** | |
87 | *** 6146,6152 **** | |
88 | pos_T our_paren_pos; | |
89 | char_u *start; | |
90 | int start_brace; | |
91 | ! #define BRACE_IN_COL0 1 /* '{' is in comumn 0 */ | |
92 | #define BRACE_AT_START 2 /* '{' is at start of line */ | |
93 | #define BRACE_AT_END 3 /* '{' is at end of line */ | |
94 | linenr_T ourscope; | |
95 | --- 6149,6155 ---- | |
96 | pos_T our_paren_pos; | |
97 | char_u *start; | |
98 | int start_brace; | |
99 | ! #define BRACE_IN_COL0 1 /* '{' is in column 0 */ | |
100 | #define BRACE_AT_START 2 /* '{' is at start of line */ | |
101 | #define BRACE_AT_END 3 /* '{' is at end of line */ | |
102 | linenr_T ourscope; | |
103 | *************** | |
104 | *** 6369,6375 **** | |
105 | if (curwin->w_cursor.lnum > 1) | |
106 | { | |
107 | /* If the start comment string matches in the previous | |
108 | ! * line, use the indent of that line pluss offset. If | |
109 | * the middle comment string matches in the previous | |
110 | * line, use the indent of that line. XXX */ | |
111 | look = skipwhite(ml_get(curwin->w_cursor.lnum - 1)); | |
112 | --- 6372,6378 ---- | |
113 | if (curwin->w_cursor.lnum > 1) | |
114 | { | |
115 | /* If the start comment string matches in the previous | |
116 | ! * line, use the indent of that line plus offset. If | |
117 | * the middle comment string matches in the previous | |
118 | * line, use the indent of that line. XXX */ | |
119 | look = skipwhite(ml_get(curwin->w_cursor.lnum - 1)); | |
120 | *************** | |
121 | *** 8222,8228 **** | |
122 | ||
123 | if (*that && *that != ';') /* not a comment line */ | |
124 | { | |
125 | ! /* test *that != '(' to accomodate first let/do | |
126 | * argument if it is more than one line */ | |
127 | if (!vi_lisp && *that != '(' && *that != '[') | |
128 | firsttry++; | |
129 | --- 8225,8231 ---- | |
130 | ||
131 | if (*that && *that != ';') /* not a comment line */ | |
132 | { | |
133 | ! /* test *that != '(' to accommodate first let/do | |
134 | * argument if it is more than one line */ | |
135 | if (!vi_lisp && *that != '(' && *that != '[') | |
136 | firsttry++; | |
137 | *** ../vim-7.1.246/src/version.c Wed Feb 13 10:27:28 2008 | |
138 | --- src/version.c Wed Feb 13 10:56:42 2008 | |
139 | *************** | |
140 | *** 668,669 **** | |
141 | --- 668,671 ---- | |
142 | { /* Add new patch number below this line */ | |
143 | + /**/ | |
144 | + 247, | |
145 | /**/ | |
146 | ||
147 | -- | |
148 | Far back in the mists of ancient time, in the great and glorious days of the | |
149 | former Galactic Empire, life was wild, rich and largely tax free. | |
150 | Mighty starships plied their way between exotic suns, seeking adventure and | |
151 | reward among the furthest reaches of Galactic space. In those days, spirits | |
152 | were brave, the stakes were high, men were real men, women were real women | |
153 | and small furry creatures from Alpha Centauri were real small furry creatures | |
154 | from Alpha Centauri. And all dared to brave unknown terrors, to do mighty | |
155 | deeds, to boldly split infinitives that no man had split before -- and thus | |
156 | was the Empire forged. | |
157 | -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" | |
158 | ||
159 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
160 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
161 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
162 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |