0
0
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00

patch 8.0.1417: test doesn't search for a sentence

Problem:    Test doesn't search for a sentence. Still fails when searching for
            start of sentence. (Dominique Pelle)
Solution:   Add paren. Check for MAXCOL in dec().
This commit is contained in:
Bram Moolenaar 2017-12-19 22:25:40 +01:00
parent 8ada6aa929
commit 1bd999f982
3 changed files with 25 additions and 4 deletions

View File

@ -417,8 +417,21 @@ dec(pos_T *lp)
#ifdef FEAT_VIRTUALEDIT
lp->coladd = 0;
#endif
if (lp->col > 0) /* still within line */
if (lp->col == MAXCOL)
{
/* past end of line */
p = ml_get(lp->lnum);
lp->col = (colnr_T)STRLEN(p);
#ifdef FEAT_MBYTE
if (has_mbyte)
lp->col -= (*mb_head_off)(p, p + lp->col);
#endif
return 0;
}
if (lp->col > 0)
{
/* still within line */
lp->col--;
#ifdef FEAT_MBYTE
if (has_mbyte)
@ -429,8 +442,10 @@ dec(pos_T *lp)
#endif
return 0;
}
if (lp->lnum > 1) /* there is a prior line */
if (lp->lnum > 1)
{
/* there is a prior line */
lp->lnum--;
p = ml_get(lp->lnum);
lp->col = (colnr_T)STRLEN(p);
@ -440,7 +455,9 @@ dec(pos_T *lp)
#endif
return 1;
}
return -1; /* at start of file */
/* at start of file */
return -1;
}
/*

View File

@ -733,6 +733,8 @@ endfunc
func Test_search_sentence()
new
" this used to cause a crash
call assert_fails("/\\%'", 'E486')
call assert_fails("/\\%')", 'E486')
call assert_fails("/", 'E486')
/\%'(
/
endfunc

View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1417,
/**/
1416,
/**/