aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

updated for version 7.2-157

Browse Source
This commit is contained in:
Bram Moolenaar 2009-04-22 14:44:41 +00:00
parent 7bfef80fab
commit fe81d45db4
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/search.c
View File

@ -2327,8 +2327,8 @@ findmatchlimit(oap, initc, flags, maxtravel)
for (col = pos.col; check_prevcol(linep, col, '\\', &col);) for (col = pos.col; check_prevcol(linep, col, '\\', &col);)
bslcnt++; bslcnt++;
} }
/* Only accept a match when 'M' is in 'cpo' or when ecaping is /* Only accept a match when 'M' is in 'cpo' or when escaping
* what we expect. */ * is what we expect. */
if (cpo_bsl || (bslcnt & 1) == match_escaped) if (cpo_bsl || (bslcnt & 1) == match_escaped)
{ {
if (c == initc) if (c == initc)
@ -4663,7 +4663,7 @@ find_pattern_in_path(ptr, dir, len, whole, skip_comments,
msg_putchar('\n'); /* cursor below last one */ msg_putchar('\n'); /* cursor below last one */
if (!got_int) /* don't display if 'q' if (!got_int) /* don't display if 'q'
typed at "--more--" typed at "--more--"
mesage */ message */
{ {
msg_home_replace_hl(new_fname); msg_home_replace_hl(new_fname);
MSG_PUTS(_(" (includes previously listed match)")); MSG_PUTS(_(" (includes previously listed match)"));
@ -4975,7 +4975,7 @@ search_line:
|| IObuff[i-2] == '!')))) || IObuff[i-2] == '!'))))
IObuff[i++] = ' '; IObuff[i++] = ' ';
} }
/* copy as much as posible of the new word */ /* copy as much as possible of the new word */
if (p - aux >= IOSIZE - i) if (p - aux >= IOSIZE - i)
p = aux + IOSIZE - i - 1; p = aux + IOSIZE - i - 1;
STRNCPY(IObuff + i, aux, p - aux); STRNCPY(IObuff + i, aux, p - aux);
@ -5010,7 +5010,7 @@ search_line:
if (did_show) if (did_show)
msg_putchar('\n'); /* cursor below last one */ msg_putchar('\n'); /* cursor below last one */
if (!got_int) /* don't display if 'q' typed if (!got_int) /* don't display if 'q' typed
at "--more--" mesage */ at "--more--" message */
msg_home_replace_hl(curr_fname); msg_home_replace_hl(curr_fname);
prev_fname = curr_fname; prev_fname = curr_fname;
} }
@ -5092,7 +5092,7 @@ search_line:
} }
if (action != ACTION_SHOW) if (action != ACTION_SHOW)
{ {
curwin->w_cursor.col = (colnr_T) (startp - line); curwin->w_cursor.col = (colnr_T)(startp - line);
curwin->w_set_curswant = TRUE; curwin->w_set_curswant = TRUE;
} }
@ -5119,7 +5119,8 @@ exit_matched:
&& action == ACTION_EXPAND && action == ACTION_EXPAND
&& !(compl_cont_status & CONT_SOL) && !(compl_cont_status & CONT_SOL)
#endif #endif
&& *(p = startp + 1)) && *startp != NUL
&& *(p = startp + 1) != NUL)
goto search_line; goto search_line;
} }
line_breakcheck(); line_breakcheck();

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 */
/**/
157,
/**/ /**/
156, 156,
/**/ /**/