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 f738e76..e7f9fab 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -745,12 +745,17 @@
/*
* 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 289dc08..ad6516f 100644
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -660,7 +660,7 @@
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 83d6ed0..ec54209 100644
--- a/src/testdir/test_listlbr_utf8.vim
+++ b/src/testdir/test_listlbr_utf8.vim
@@ -167,7 +167,7 @@
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 346894d..bd93ff7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 681,
+/**/
680,
/**/
679,