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

updated for version 7.2-189

Browse Source
This commit is contained in:
Bram Moolenaar
2009-05-26 09:02:10 +00:00
parent c0a6fac5af
commit 4be506815d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/edit.c
View File

@@ -6420,13 +6420,17 @@ stop_insert(end_insert_pos, esc)
/* If we just did an auto-indent, remove the white space from the end /* If we just did an auto-indent, remove the white space from the end
* of the line, and put the cursor back. * of the line, and put the cursor back.
* Do this when ESC was used or moving the cursor up/down. */ * Do this when ESC was used or moving the cursor up/down.
* Check for the old position still being valid, just in case the text
* got changed unexpectedly. */
if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
&& curwin->w_cursor.lnum != end_insert_pos->lnum))) && curwin->w_cursor.lnum != end_insert_pos->lnum))
&& end_insert_pos->lnum <= curbuf->b_ml.ml_line_count)
{ {
pos_T tpos = curwin->w_cursor; pos_T tpos = curwin->w_cursor;
curwin->w_cursor = *end_insert_pos; curwin->w_cursor = *end_insert_pos;
check_cursor_col(); /* make sure it is not past the line */
for (;;) for (;;)
{ {
if (gchar_cursor() == NUL && curwin->w_cursor.col > 0) if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
@@ -6434,7 +6438,8 @@ stop_insert(end_insert_pos, esc)
cc = gchar_cursor(); cc = gchar_cursor();
if (!vim_iswhite(cc)) if (!vim_iswhite(cc))
break; break;
(void)del_char(TRUE); if (del_char(TRUE) == FAIL)
break; /* should not happen */
} }
if (curwin->w_cursor.lnum != tpos.lnum) if (curwin->w_cursor.lnum != tpos.lnum)
curwin->w_cursor = tpos; curwin->w_cursor = tpos;

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 */
/**/
189,
/**/ /**/
188, 188,
/**/ /**/