neovim

commit 8b43091392ec895c77b83ff5964cd37b54976089
parent b92ed35a0bb873589bba9b51fdb92ffd00dc3e57
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri,  1 Apr 2022 18:31:19 +0800

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)
https://github.com/vim/vim/commit/04b871da800768287a8a432de568b11297db8686

Diffstat:
M
src/nvim/option.c
 | 
1
-
M
src/nvim/testdir/test_breakindent.vim
 | 
17
++++++++++++++++-

2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/nvim/option.c b/src/nvim/option.c
@@ -5225,7 +5225,6 @@ unsigned int get_bkc_value(buf_T *buf)
 /// @param buf The buffer.
 char *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;
   }
diff --git a/src/nvim/testdir/test_breakindent.vim b/src/nvim/testdir/test_breakindent.vim
@@ -930,7 +930,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!