From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 6 Oct 2022 20:24:34 +0000 (+0100)
Subject: patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set
X-Git-Tag: v9.0.0681
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0937b9fb244949b7ce9bfcf8398d7495b9b6aa85;p=vim

patch 9.0.0681: "<<<" shows for 'smoothscroll' even when 'showbreak is set

Problem:    "<<<" shows for 'smoothscroll' even when 'showbreak is set.
Solution:   When 'showbreak' is set do not display "<<<".
---

diff --git a/src/drawline.c b/src/drawline.c
index f738e76b4..e7f9fabab 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -745,12 +745,17 @@ text_prop_position(
 
 /*
  * Call screen_line() using values from "wlv".
- * Also takes care of putting "<<<" on the first line for 'smoothscroll'.
+ * Also takes care of putting "<<<" on the first line for 'smoothscroll'
+ * when 'showbreak' is not set.
  */
     static void
 wlv_screen_line(win_T *wp, winlinevars_T *wlv, int negative_width)
 {
-    if (wlv->row == 0 && wp->w_skipcol > 0)
+    if (wlv->row == 0 && wp->w_skipcol > 0
+#if defined(FEAT_LINEBREAK)
+	    && *get_showbreak_value(wp) == NUL
+#endif
+	    )
     {
 	int off = (int)(current_ScreenLine - ScreenLines);
 
diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index 289dc08bf..ad6516fb6 100644
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -660,7 +660,7 @@ func Test_breakindent19_sbr_nextpage()
   norm! 5gj
   let lines = s:screen_lines(1, 20)
   let expect = [
-	\ "<<<aaaaaaaaaaaaaaaaa",
+	\ ">aaaaaaaaaaaaaaaaaaa",
 	\ ">aaaaaaaaaaaaaaaaaaa",
 	\ ">aaaaaaaaaaaaaaaaaaa",
 	\ ]
diff --git a/src/testdir/test_listlbr_utf8.vim b/src/testdir/test_listlbr_utf8.vim
index 83d6ed0c7..ec5420918 100644
--- a/src/testdir/test_listlbr_utf8.vim
+++ b/src/testdir/test_listlbr_utf8.vim
@@ -167,7 +167,7 @@ func Test_visual_block_and_selection_exclusive()
   exe "norm! $3B\<C-v>eAx\<Esc>"
   let lines = s:screen_lines([1, 10], winwidth(0))
   let expect = [
-\ "<<<obar foobar      ",
+\ "+foobar foobar      ",
 \ "+foobar foobar      ",
 \ "+foobar foobar      ",
 \ "+foobar foobar      ",
diff --git a/src/version.c b/src/version.c
index 346894dd6..bd93ff703 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    681,
 /**/
     680,
 /**/