Mercurial > vim

comparison src/netbeans.c @ 1570:f0cfff4dcc2f v7.1.283

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.1-283
author vimboss
date Sun, 16 Mar 2008 15:04:34 +0000
parents 066778e39c2a
children eb9cbad50fa3
comparison
equal deleted inserted replaced
1569:9fbb40a1228a 1570:f0cfff4dcc2f
1214 char_u *oldtext, *newtext; 1214 char_u *oldtext, *newtext;
1215 int oldlen; 1215 int oldlen;
1216 int lastbyte = last; 1216 int lastbyte = last;
1217 1217
1218 oldtext = ml_get(lnum); 1218 oldtext = ml_get(lnum);
1219 oldlen = STRLEN(oldtext); 1219 oldlen = (int)STRLEN(oldtext);
1220 if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */ 1220 if (first >= (colnr_T)oldlen || oldlen == 0) /* just in case */
1221 return; 1221 return;
1222 if (lastbyte >= oldlen) 1222 if (lastbyte >= oldlen)
1223 lastbyte = oldlen - 1; 1223 lastbyte = oldlen - 1;
1224 newtext = alloc(oldlen - (int)(lastbyte - first)); 1224 newtext = alloc(oldlen - (int)(lastbyte - first));
1239 nb_joinlines(linenr_T first, linenr_T other) 1239 nb_joinlines(linenr_T first, linenr_T other)
1240 { 1240 {
1241 int len_first, len_other; 1241 int len_first, len_other;
1242 char_u *p; 1242 char_u *p;
1243 1243
1244 len_first = STRLEN(ml_get(first)); 1244 len_first = (int)STRLEN(ml_get(first));
1245 len_other = STRLEN(ml_get(other)); 1245 len_other = (int)STRLEN(ml_get(other));
1246 p = alloc((unsigned)(len_first + len_other + 1)); 1246 p = alloc((unsigned)(len_first + len_other + 1));
1247 if (p != NULL) 1247 if (p != NULL)
1248 { 1248 {
1249 mch_memmove(p, ml_get(first), len_first); 1249 mch_memmove(p, ml_get(first), len_first);
1250 mch_memmove(p + len_first, ml_get(other), len_other + 1); 1250 mch_memmove(p + len_first, ml_get(other), len_other + 1);