commit 04b871da800768287a8a432de568b11297db8686
author Bram Moolenaar <Bram@vim.org> Sat Jan 15 18:31:43 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Sat Jan 15 18:31:43 2022 +0000
tree 6ab122203671484d74aecdd083174a4268c62d66
parent e32c3c462ce9b3163a4a4bffd985897910885d29

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)

src/option.c

diff --git a/src/option.c b/src/option.c
index 0a75c24..ff53968 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7058,7 +7058,6 @@
     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;

src/testdir/test_breakindent.vim

diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index 2ac127d..6258a7a 100644
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -890,7 +890,22 @@
   \ "~                   ",
   \ ]
   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!

src/version.c

diff --git a/src/version.c b/src/version.c
index 5bf6df4..d34f1a1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4100,
+/**/
     4099,
 /**/
     4098,