aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.1-107

Browse Source
This commit is contained in:
Bram Moolenaar
2007-09-13 20:41:32 +00:00
parent 5c2e0f27c5
commit 53241daeba
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ops.c
View File

@@ -2477,7 +2477,7 @@ op_insert(oap, count1)
/* /*
* Spaces and tabs in the indent may have changed to other spaces and * Spaces and tabs in the indent may have changed to other spaces and
* tabs. Get the starting column again and correct the lenght. * tabs. Get the starting column again and correct the length.
* Don't do this when "$" used, end-of-line will have changed. * Don't do this when "$" used, end-of-line will have changed.
*/ */
block_prep(oap, &bd2, oap->start.lnum, TRUE); block_prep(oap, &bd2, oap->start.lnum, TRUE);
@@ -2534,7 +2534,9 @@ op_change(oap)
#ifdef FEAT_VISUALEXTRA #ifdef FEAT_VISUALEXTRA
long offset; long offset;
linenr_T linenr; linenr_T linenr;
long ins_len, pre_textlen = 0; long ins_len;
long pre_textlen = 0;
long pre_indent = 0;
char_u *firstline; char_u *firstline;
char_u *ins_text, *newp, *oldp; char_u *ins_text, *newp, *oldp;
struct block_def bd; struct block_def bd;
@@ -2579,7 +2581,9 @@ op_change(oap)
|| gchar_cursor() == NUL)) || gchar_cursor() == NUL))
coladvance_force(getviscol()); coladvance_force(getviscol());
# endif # endif
pre_textlen = (long)STRLEN(ml_get(oap->start.lnum)); firstline = ml_get(oap->start.lnum);
pre_textlen = (long)STRLEN(firstline);
pre_indent = (long)(skipwhite(firstline) - firstline);
bd.textcol = curwin->w_cursor.col; bd.textcol = curwin->w_cursor.col;
} }
#endif #endif
@@ -2598,13 +2602,22 @@ op_change(oap)
*/ */
if (oap->block_mode && oap->start.lnum != oap->end.lnum) if (oap->block_mode && oap->start.lnum != oap->end.lnum)
{ {
/* Auto-indenting may have changed the indent. If the cursor was past
* the indent, exclude that indent change from the inserted text. */
firstline = ml_get(oap->start.lnum); firstline = ml_get(oap->start.lnum);
/* if (bd.textcol > pre_indent)
* Subsequent calls to ml_get() flush the firstline data - take a
* copy of the required bit.
*/
if ((ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
{ {
long new_indent = (long)(skipwhite(firstline) - firstline);
pre_textlen += new_indent - pre_indent;
bd.textcol += new_indent - pre_indent;
}
ins_len = (long)STRLEN(firstline) - pre_textlen;
if (ins_len > 0)
{
/* Subsequent calls to ml_get() flush the firstline data - take a
* copy of the inserted text. */
if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL)
{ {
vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len);

2
src/version.c
View File

@@ -666,6 +666,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 */
/**/
107,
/**/ /**/
106, 106,
/**/ /**/