|
 |
449dbcb |
To: vim-dev@vim.org
|
|
|
449dbcb |
Subject: Patch 7.2.253
|
|
|
449dbcb |
Fcc: outbox
|
|
|
449dbcb |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
449dbcb |
Mime-Version: 1.0
|
|
|
449dbcb |
Content-Type: text/plain; charset=UTF-8
|
|
|
449dbcb |
Content-Transfer-Encoding: 8bit
|
|
|
449dbcb |
------------
|
|
|
449dbcb |
|
|
|
449dbcb |
Patch 7.2.253
|
|
|
449dbcb |
Problem: Netbeans interface: getLength always uses current buffer.
|
|
|
449dbcb |
Solution: Use ml_get_buf() instead of ml_get(). (Xavier de Gaye)
|
|
|
449dbcb |
Files: src/netbeans.c
|
|
|
449dbcb |
|
|
|
449dbcb |
|
|
|
449dbcb |
*** ../vim-7.2.252/src/netbeans.c 2009-06-24 16:49:50.000000000 +0200
|
|
|
449dbcb |
--- src/netbeans.c 2009-09-11 13:40:14.000000000 +0200
|
|
|
449dbcb |
***************
|
|
|
449dbcb |
*** 1499,1505 ****
|
|
|
449dbcb |
return FAIL;
|
|
|
449dbcb |
}
|
|
|
449dbcb |
first = *pos;
|
|
|
449dbcb |
! nbdebug((" FIRST POS: line %d, col %d\n", first.lnum, first.col));
|
|
|
449dbcb |
pos = off2pos(buf->bufp, off+count-1);
|
|
|
449dbcb |
if (!pos)
|
|
|
449dbcb |
{
|
|
|
449dbcb |
--- 1499,1506 ----
|
|
|
449dbcb |
return FAIL;
|
|
|
449dbcb |
}
|
|
|
449dbcb |
first = *pos;
|
|
|
449dbcb |
! nbdebug((" FIRST POS: line %d, col %d\n",
|
|
|
449dbcb |
! first.lnum, first.col));
|
|
|
449dbcb |
pos = off2pos(buf->bufp, off+count-1);
|
|
|
449dbcb |
if (!pos)
|
|
|
449dbcb |
{
|
|
|
449dbcb |
***************
|
|
|
449dbcb |
*** 1510,1516 ****
|
|
|
449dbcb |
return FAIL;
|
|
|
449dbcb |
}
|
|
|
449dbcb |
last = *pos;
|
|
|
449dbcb |
! nbdebug((" LAST POS: line %d, col %d\n", last.lnum, last.col));
|
|
|
449dbcb |
del_from_lnum = first.lnum;
|
|
|
449dbcb |
del_to_lnum = last.lnum;
|
|
|
449dbcb |
doupdate = 1;
|
|
|
449dbcb |
--- 1511,1518 ----
|
|
|
449dbcb |
return FAIL;
|
|
|
449dbcb |
}
|
|
|
449dbcb |
last = *pos;
|
|
|
449dbcb |
! nbdebug((" LAST POS: line %d, col %d\n",
|
|
|
449dbcb |
! last.lnum, last.col));
|
|
|
449dbcb |
del_from_lnum = first.lnum;
|
|
|
449dbcb |
del_to_lnum = last.lnum;
|
|
|
449dbcb |
doupdate = 1;
|
|
|
449dbcb |
***************
|
|
|
449dbcb |
*** 1521,1527 ****
|
|
|
449dbcb |
next = off2pos(buf->bufp, off + count);
|
|
|
449dbcb |
|
|
|
449dbcb |
/* Remove part of the first line. */
|
|
|
449dbcb |
! if (first.col != 0 || (next != NULL && first.lnum == next->lnum))
|
|
|
449dbcb |
{
|
|
|
449dbcb |
if (first.lnum != last.lnum
|
|
|
449dbcb |
|| (next != NULL && first.lnum != next->lnum))
|
|
|
449dbcb |
--- 1523,1530 ----
|
|
|
449dbcb |
next = off2pos(buf->bufp, off + count);
|
|
|
449dbcb |
|
|
|
449dbcb |
/* Remove part of the first line. */
|
|
|
449dbcb |
! if (first.col != 0
|
|
|
449dbcb |
! || (next != NULL && first.lnum == next->lnum))
|
|
|
449dbcb |
{
|
|
|
449dbcb |
if (first.lnum != last.lnum
|
|
|
449dbcb |
|| (next != NULL && first.lnum != next->lnum))
|
|
|
449dbcb |
***************
|
|
|
449dbcb |
*** 1584,1590 ****
|
|
|
449dbcb |
int id = buf_findsign_id(buf->bufp, (linenr_T)i);
|
|
|
449dbcb |
if (id > 0)
|
|
|
449dbcb |
{
|
|
|
449dbcb |
! nbdebug((" Deleting sign %d on line %d\n", id, i));
|
|
|
449dbcb |
buf_delsign(buf->bufp, id);
|
|
|
449dbcb |
}
|
|
|
449dbcb |
else
|
|
|
449dbcb |
--- 1587,1594 ----
|
|
|
449dbcb |
int id = buf_findsign_id(buf->bufp, (linenr_T)i);
|
|
|
449dbcb |
if (id > 0)
|
|
|
449dbcb |
{
|
|
|
449dbcb |
! nbdebug((" Deleting sign %d on line %d\n",
|
|
|
449dbcb |
! id, i));
|
|
|
449dbcb |
buf_delsign(buf->bufp, id);
|
|
|
449dbcb |
}
|
|
|
449dbcb |
else
|
|
|
449dbcb |
***************
|
|
|
449dbcb |
*** 1593,1599 ****
|
|
|
449dbcb |
}
|
|
|
449dbcb |
}
|
|
|
449dbcb |
|
|
|
449dbcb |
! nbdebug((" Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
|
|
|
449dbcb |
curwin->w_cursor.lnum = del_from_lnum;
|
|
|
449dbcb |
curwin->w_cursor.col = 0;
|
|
|
449dbcb |
del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
|
|
|
449dbcb |
--- 1597,1604 ----
|
|
|
449dbcb |
}
|
|
|
449dbcb |
}
|
|
|
449dbcb |
|
|
|
449dbcb |
! nbdebug((" Deleting lines %d through %d\n",
|
|
|
449dbcb |
! del_from_lnum, del_to_lnum));
|
|
|
449dbcb |
curwin->w_cursor.lnum = del_from_lnum;
|
|
|
449dbcb |
curwin->w_cursor.col = 0;
|
|
|
449dbcb |
del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
|
|
|
449dbcb |
***************
|
|
|
449dbcb |
*** 3514,3520 ****
|
|
|
449dbcb |
eol_size = 1;
|
|
|
449dbcb |
for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
|
|
|
449dbcb |
{
|
|
|
449dbcb |
! char_count += (long)STRLEN(ml_get(lnum)) + eol_size;
|
|
|
449dbcb |
/* Check for a CTRL-C every 100000 characters */
|
|
|
449dbcb |
if (char_count > last_check)
|
|
|
449dbcb |
{
|
|
|
449dbcb |
--- 3519,3526 ----
|
|
|
449dbcb |
eol_size = 1;
|
|
|
449dbcb |
for (lnum = 1; lnum <= bufp->b_ml.ml_line_count; ++lnum)
|
|
|
449dbcb |
{
|
|
|
449dbcb |
! char_count += (long)STRLEN(ml_get_buf(bufp, lnum, FALSE))
|
|
|
449dbcb |
! + eol_size;
|
|
|
449dbcb |
/* Check for a CTRL-C every 100000 characters */
|
|
|
449dbcb |
if (char_count > last_check)
|
|
|
449dbcb |
{
|
|
|
449dbcb |
*** ../vim-7.2.252/src/version.c 2009-09-11 14:02:25.000000000 +0200
|
|
|
449dbcb |
--- src/version.c 2009-09-11 14:18:45.000000000 +0200
|
|
|
449dbcb |
***************
|
|
|
449dbcb |
*** 678,679 ****
|
|
|
449dbcb |
--- 678,681 ----
|
|
|
449dbcb |
{ /* Add new patch number below this line */
|
|
|
449dbcb |
+ /**/
|
|
|
449dbcb |
+ 253,
|
|
|
449dbcb |
/**/
|
|
|
449dbcb |
|
|
|
449dbcb |
--
|
|
|
449dbcb |
hundred-and-one symptoms of being an internet addict:
|
|
|
449dbcb |
227. You sleep next to your monitor. Or on top of it.
|
|
|
449dbcb |
|
|
|
449dbcb |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
449dbcb |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
449dbcb |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
449dbcb |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|