thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2-253

Browse Source
This commit is contained in:
Bram Moolenaar
2009-09-11 12:19:51 +00:00
parent 183bb3e4b6
commit fa68b0fc1a
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/netbeans.c
View File

@@ -1499,7 +1499,8 @@ nb_do_cmd(
return FAIL; return FAIL;
} }
first = *pos; first = *pos;
nbdebug((" FIRST POS: line %d, col %d\n", first.lnum, first.col)); nbdebug((" FIRST POS: line %d, col %d\n",
first.lnum, first.col));
pos = off2pos(buf->bufp, off+count-1); pos = off2pos(buf->bufp, off+count-1);
if (!pos) if (!pos)
{ {
@@ -1510,7 +1511,8 @@ nb_do_cmd(
return FAIL; return FAIL;
} }
last = *pos; last = *pos;
nbdebug((" LAST POS: line %d, col %d\n", last.lnum, last.col)); nbdebug((" LAST POS: line %d, col %d\n",
last.lnum, last.col));
del_from_lnum = first.lnum; del_from_lnum = first.lnum;
del_to_lnum = last.lnum; del_to_lnum = last.lnum;
doupdate = 1; doupdate = 1;
@@ -1521,7 +1523,8 @@ nb_do_cmd(
next = off2pos(buf->bufp, off + count); next = off2pos(buf->bufp, off + count);
/* Remove part of the first line. */ /* Remove part of the first line. */
if (first.col != 0 || (next != NULL && first.lnum == next->lnum)) if (first.col != 0
|| (next != NULL && first.lnum == next->lnum))
{ {
if (first.lnum != last.lnum if (first.lnum != last.lnum
|| (next != NULL && first.lnum != next->lnum)) || (next != NULL && first.lnum != next->lnum))
@@ -1584,7 +1587,8 @@ nb_do_cmd(
int id = buf_findsign_id(buf->bufp, (linenr_T)i); int id = buf_findsign_id(buf->bufp, (linenr_T)i);
if (id > 0) if (id > 0)
{ {
nbdebug((" Deleting sign %d on line %d\n", id, i)); nbdebug((" Deleting sign %d on line %d\n",
id, i));
buf_delsign(buf->bufp, id); buf_delsign(buf->bufp, id);
} }
else else
@@ -1593,7 +1597,8 @@ nb_do_cmd(
} }
} }
nbdebug((" Deleting lines %d through %d\n", del_from_lnum, del_to_lnum)); nbdebug((" Deleting lines %d through %d\n",
del_from_lnum, del_to_lnum));
curwin->w_cursor.lnum = del_from_lnum; curwin->w_cursor.lnum = del_from_lnum;
curwin->w_cursor.col = 0; curwin->w_cursor.col = 0;
del_lines(del_to_lnum - del_from_lnum + 1, FALSE); del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
@@ -3514,7 +3519,8 @@ get_buf_size(buf_T *bufp)
eol_size = 1; eol_size = 1;
for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum) for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
{ {
char_count += (long)STRLEN(ml_get(lnum)) + eol_size; char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
+ eol_size;
/* Check for a CTRL-C every 100000 characters */ /* Check for a CTRL-C every 100000 characters */
if (char_count > last_check) if (char_count > last_check)
{ {

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
253,
/**/ /**/
252, 252,
/**/ /**/