commit f0a9d65e0a1d693cdfa964aa72de5b93b4cacdea
author zeertzjq <zeertzjq@outlook.com> Mon Feb 12 22:53:20 2024 +0100
committer Christian Brabandt <cb@256bit.org> Mon Feb 12 22:53:20 2024 +0100
tree a7bcca9cd0529aca96d62ff1b7bf8f96a00f11c3
parent b47fbb40837512cdd2d8c25eaf9952154836b99d

patch 9.1.0103: 'breakindentopt' "min" not correct with 'signcolumn'

Problem:  'breakindentopt' "min" works incorrectly with 'signcolumn'.
Solution: Use win_col_off() and win_col_off2().
          (zeertzjq)

closes: #14014

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

src/indent.c

diff --git a/src/indent.c b/src/indent.c
index 34d3157..1087bad 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -935,9 +935,7 @@
     int		    bri = 0;
     // window width minus window margin space, i.e. what rests for text
     const int	    eff_wwidth = wp->w_width
-			    - ((wp->w_p_nu || wp->w_p_rnu)
-				&& (vim_strchr(p_cpo, CPO_NUMCOL) == NULL)
-						? number_width(wp) + 1 : 0);
+					  - win_col_off(wp) + win_col_off2(wp);
 
     // In list mode, if 'listchars' "tab" isn't set, a TAB is displayed as ^I.
     int no_ts = wp->w_p_list && wp->w_lcs_chars.tab1 == NUL;

src/testdir/test_breakindent.vim

diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index 9fde0f3..96d91c9 100644
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -733,7 +733,7 @@
 	\ "shall make no law   ",
 	\ ]
   call s:compare_lines(expect, lines)
-  " set minimum indent
+  " set minimum text width
   setl briopt=min:5
   redraw!
   let lines = s:screen_lines2(1, 6, 20)
@@ -1133,4 +1133,36 @@
   bwipe!
 endfunc
 
+func Test_breakindent_min_with_signcol()
+  call s:test_windows('setl briopt=min:15 signcolumn=yes')
+  redraw!
+  let expect = [
+        \ "      abcdefghijklmn",
+        \ "     opqrstuvwxyzABC",
+        \ "     DEFGHIJKLMNOP  "
+        \ ]
+  let lines = s:screen_lines(line('.'), 20)
+  call s:compare_lines(expect, lines)
+  setl briopt=min:17
+  redraw!
+  let expect = [
+        \ "      abcdefghijklmn",
+        \ "   opqrstuvwxyzABCDE",
+        \ "   FGHIJKLMNOP      "
+        \ ]
+  let lines = s:screen_lines(line('.'), 20)
+  call s:compare_lines(expect, lines)
+  setl briopt=min:19
+  redraw!
+  let expect = [
+        \ "      abcdefghijklmn",
+        \ "  opqrstuvwxyzABCDEF",
+        \ "  GHIJKLMNOP        "
+        \ ]
+  let lines = s:screen_lines(line('.'), 20)
+  call s:compare_lines(expect, lines)
+
+  call s:close_windows()
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

src/testdir/test_diffmode.vim

diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 8e7d5ce..bae94f6 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
Binary files differ

src/version.c

diff --git a/src/version.c b/src/version.c
index e20b427..e28a326 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    103,
+/**/
     102,
 /**/
     101,