To: vim_dev@googlegroups.com
Subject: Patch 8.2.4100
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.4100
Problem:    Early return when getting the 'formatlistpat' value.
Solution:   Remove the first line. (Christian Brabandt)
Files:      src/option.c, src/testdir/test_breakindent.vim


*** ../vim-8.2.4099/src/option.c	2022-01-15 10:00:59.576603900 +0000
--- src/option.c	2022-01-15 18:30:54.296671750 +0000
***************
*** 7058,7064 ****
      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;
--- 7058,7063 ----
*** ../vim-8.2.4099/src/testdir/test_breakindent.vim	2022-01-15 10:00:59.576603900 +0000
--- src/testdir/test_breakindent.vim	2022-01-15 18:29:41.416816770 +0000
***************
*** 890,896 ****
    \ "~                   ",
    \ ]
    let lines = s:screen_lines2(1, 4, 20)
!   " 3) add something in front, no additional indent
    norm! gg0
    exe ":norm! 5iword \<esc>"
    redraw!
--- 890,911 ----
    \ "~                   ",
    \ ]
    let lines = s:screen_lines2(1, 4, 20)
!   " 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!
*** ../vim-8.2.4099/src/version.c	2022-01-15 18:25:04.665419370 +0000
--- src/version.c	2022-01-15 18:31:13.048635151 +0000
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     4100,
  /**/

-- 
A real patriot is the fellow who gets a parking ticket and rejoices
that the system works.


 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///