Mercurial > vim
changeset 27142:d2471d710ec9 v8.2.4100
patch 8.2.4100: early return when getting the 'formatlistpat' value
Commit: https://github.com/vim/vim/commit/04b871da800768287a8a432de568b11297db8686
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 15 18:31:43 2022 +0000
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 15 Jan 2022 19:45:03 +0100 |
| parents | 5d0ddfc61e67 |
| children | fee0ac14727e |
| files | src/option.c src/testdir/test_breakindent.vim src/version.c |
| diffstat | 3 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -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;
--- a/src/testdir/test_breakindent.vim +++ b/src/testdir/test_breakindent.vim @@ -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!