From 04b871da800768287a8a432de568b11297db8686 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 15 Jan 2022 18:31:43 +0000
Subject: 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                     |  1 -
 src/testdir/test_breakindent.vim | 17 ++++++++++++++++-
 src/version.c                    |  2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/option.c b/src/option.c
index 0a75c2417c..ff539683e1 100644
--- 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;
diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index 2ac127dd54..6258a7ac5f 100644
--- 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!
diff --git a/src/version.c b/src/version.c
index 5bf6df495e..d34f1a1536 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4100,
 /**/
     4099,
 /**/
-- 
cgit v1.2.3