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

updated for version 7.3.647

Browse Source 
Problem:    "gnd" doesn't work correctly in Visual mode.
Solution:   Handle Visual mode differently in "gn". (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2012-09-05 12:16:45 +02:00
parent 465748e411
commit 57c0ea8692
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/search.c
View File

@@ -4545,7 +4545,6 @@ current_search(count, forward)
int dir;
int result; /* result of various function calls */
char_u old_p_ws = p_ws;
int visual_active = FALSE;
int flags = 0;
pos_T save_VIsual;
int zerowidth = FALSE;
@@ -4561,11 +4560,6 @@ current_search(count, forward)
{
orig_pos = curwin->w_cursor;
save_VIsual = VIsual;
visual_active = TRUE;
/* just started visual selection, only one character */
if (equalpos(VIsual, curwin->w_cursor))
visual_active = FALSE;
pos = curwin->w_cursor;
start_pos = VIsual;
@@ -4619,7 +4613,7 @@ current_search(count, forward)
p_ws = old_p_ws;
return FAIL;
}
else if (!i && !result && !visual_active)
else if (!i && !result)
{
if (forward) /* try again from start of buffer */
{
@@ -4691,7 +4685,8 @@ is_zerowidth(pattern)
regmmatch_T regmatch;
int nmatched = 0;
int result = -1;
pos_T pos;
pos_T pos;
int save_called_emsg = called_emsg;
if (search_regcomp(pattern, RE_SEARCH, RE_SEARCH,
SEARCH_KEEP, &regmatch) == FAIL)
@@ -4704,15 +4699,17 @@ is_zerowidth(pattern)
{
/* Zero-width pattern should match somewhere, then we can check if
* start and end are in the same position. */
called_emsg = FALSE;
nmatched = vim_regexec_multi(&regmatch, curwin, curbuf,
pos.lnum, (colnr_T)0, NULL);
if (!called_emsg)
result = (nmatched != 0
&& regmatch.startpos[0].lnum == regmatch.endpos[0].lnum
&& regmatch.startpos[0].col == regmatch.endpos[0].col);
&& regmatch.startpos[0].lnum == regmatch.endpos[0].lnum
&& regmatch.startpos[0].col == regmatch.endpos[0].col);
}
called_emsg |= save_called_emsg;
vim_free(regmatch.regprog);
return result;
}