1
0
forked from aniani/vim

patch 8.2.4100: early return when getting the 'formatlistpat' value

Problem:    Early return when getting the 'formatlistpat' value.
Solution:   Remove the first line. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2022-01-15 18:31:43 +00:00
parent e32c3c462c
commit 04b871da80
3 changed files with 18 additions and 2 deletions

View File

@@ -7058,7 +7058,6 @@ get_bkc_value(buf_T *buf)
char_u *
get_flp_value(buf_T *buf)
{
return buf->b_p_flp ? buf->b_p_flp : p_flp;
if (buf->b_p_flp == NULL || *buf->b_p_flp == NUL)
return p_flp;
return buf->b_p_flp;

View File

@@ -890,7 +890,22 @@ func Test_no_extra_indent()
\ "~ ",
\ ]
let lines = s:screen_lines2(1, 4, 20)
" 3) add something in front, no additional indent
" 3) no local formatlist pattern,
" so use global one -> indent
let g_flp = &g:flp
let &g:formatlistpat='^\s*\d\+\.\s\+'
let &l:formatlistpat=''
let expect = [
\ " 1. word word word ",
\ " word word word ",
\ " word word ",
\ "~ ",
\ ]
let lines = s:screen_lines2(1, 4, 20)
call s:compare_lines(expect, lines)
let &g:flp = g_flp
let &l:formatlistpat='^\s*\d\+\.'
" 4) add something in front, no additional indent
norm! gg0
exe ":norm! 5iword \<esc>"
redraw!

View File

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