aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

updated for version 7.4.636

Browse Source 
Problem:    A search with end offset gets stuck at end of file. (Gary Johnson)
Solution:   When a search doesn't move the cursor repeat it with a higher
            count. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2015-02-17 15:43:57 +01:00
parent 05eb612ff3
commit 4653911950
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/normal.c
View File

@@ -100,7 +100,7 @@ static void nv_end __ARGS((cmdarg_T *cap));
static void nv_dollar __ARGS((cmdarg_T *cap)); static void nv_dollar __ARGS((cmdarg_T *cap));
static void nv_search __ARGS((cmdarg_T *cap)); static void nv_search __ARGS((cmdarg_T *cap));
static void nv_next __ARGS((cmdarg_T *cap)); static void nv_next __ARGS((cmdarg_T *cap));
static void normal_search __ARGS((cmdarg_T *cap, int dir, char_u *pat, int opt)); static int normal_search __ARGS((cmdarg_T *cap, int dir, char_u *pat, int opt));
static void nv_csearch __ARGS((cmdarg_T *cap)); static void nv_csearch __ARGS((cmdarg_T *cap));
static void nv_brackets __ARGS((cmdarg_T *cap)); static void nv_brackets __ARGS((cmdarg_T *cap));
static void nv_percent __ARGS((cmdarg_T *cap)); static void nv_percent __ARGS((cmdarg_T *cap));
@@ -5765,7 +5765,7 @@ nv_ident(cap)
init_history(); init_history();
add_to_history(HIST_SEARCH, buf, TRUE, NUL); add_to_history(HIST_SEARCH, buf, TRUE, NUL);
#endif #endif
normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0); (void)normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0);
} }
else else
do_cmdline_cmd(buf); do_cmdline_cmd(buf);
@@ -6301,7 +6301,7 @@ nv_search(cap)
return; return;
} }
normal_search(cap, cap->cmdchar, cap->searchbuf, (void)normal_search(cap, cap->cmdchar, cap->searchbuf,
(cap->arg ? 0 : SEARCH_MARK)); (cap->arg ? 0 : SEARCH_MARK));
} }
@@ -6313,14 +6313,26 @@ nv_search(cap)
nv_next(cap) nv_next(cap)
cmdarg_T *cap; cmdarg_T *cap;
{ {
normal_search(cap, 0, NULL, SEARCH_MARK | cap->arg); pos_T old = curwin->w_cursor;
int i = normal_search(cap, 0, NULL, SEARCH_MARK | cap->arg);
if (i == 1 && equalpos(old, curwin->w_cursor))
{
/* Avoid getting stuck on the current cursor position, which can
* happen when an offset is given and the cursor is on the last char
* in the buffer: Repeat with count + 1. */
cap->count1 += 1;
(void)normal_search(cap, 0, NULL, SEARCH_MARK | cap->arg);
cap->count1 -= 1;
}
} }
/* /*
* Search for "pat" in direction "dir" ('/' or '?', 0 for repeat). * Search for "pat" in direction "dir" ('/' or '?', 0 for repeat).
* Uses only cap->count1 and cap->oap from "cap". * Uses only cap->count1 and cap->oap from "cap".
* Return 0 for failure, 1 for found, 2 for found and line offset added.
*/ */
static void static int
normal_search(cap, dir, pat, opt) normal_search(cap, dir, pat, opt)
cmdarg_T *cap; cmdarg_T *cap;
int dir; int dir;
@@ -6354,6 +6366,7 @@ normal_search(cap, dir, pat, opt)
/* "/$" will put the cursor after the end of the line, may need to /* "/$" will put the cursor after the end of the line, may need to
* correct that here */ * correct that here */
check_cursor(); check_cursor();
return i;
} }
/* /*

6
src/testdir/test44.in
View File

@@ -42,6 +42,12 @@ G:put =matchstr(\"אבגד\", \".\", 0, 2) " ב
:put =matchstr(\"אבגד\", \"..\", 0, 2) " בג :put =matchstr(\"אבגד\", \"..\", 0, 2) " בג
:put =matchstr(\"אבגד\", \".\", 0, 0) " א :put =matchstr(\"אבגד\", \".\", 0, 0) " א
:put =matchstr(\"אבגד\", \".\", 4, -1) " ג :put =matchstr(\"אבגד\", \".\", 4, -1) " ג
:new
:$put =['dog(a', 'cat(']
/(/e+
"ayn:bd!
:$put =''
G"ap
:w! :w!
:qa! :qa!
ENDTEST ENDTEST

2
src/testdir/test44.ok
View File

@@ -22,3 +22,5 @@ k œ̄ṣ́m̥̄ᾱ̆́
בג בג
א א
ג ג
a
cat(

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
636,
/**/ /**/
635, 635,
/**/ /**/