From b4a10dd9b2294ade48284157c7065a47e9b02ebe Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 21 Sep 2019 20:29:15 -0700
Subject: [PATCH] vim-patch:8.1.2060: "precedes" in 'listchars' not used
 properly

(Credit: Zach Wegner, https://github.com/neovim/neovim/pull/11034)

Problem:    "precedes" in 'listchars' not used properly.
Solution:   Correctly handle the "precedes" char in list mode for long lines.
https://github.com/vim/vim/commit/bffba7f7042f6082e75b42484b15f66087b01941
---
 runtime/doc/options.txt        | 5 +++--
 src/nvim/screen.c              | 8 +++-----
 src/nvim/testdir/view_util.vim | 1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 09d614eb2a..525475b60b 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3698,8 +3698,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			off and the line continues beyond the right of the
 			screen.
 							*lcs-precedes*
-	  precedes:c	Character to show in the first column, when there is
-			text preceding the character visible in the first column.
+	  precedes:c	Character to show in the first visible column of the
+			physical line, when there is text preceding the
+			character visible in the first column.
 							*lcs-conceal*
 	  conceal:c	Character to show in place of concealed text, when
 			'conceallevel' is set to 1.  A space when omitted.
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 39dcc03fb0..4b4b2c416f 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3770,11 +3770,9 @@ win_line (
       char_attr = hl_combine_attr(char_attr, extra_attr);
     }
 
-    /*
-     * Handle the case where we are in column 0 but not on the first
-     * character of the line and the user wants us to show us a
-     * special character (via 'listchars' option "precedes:<char>".
-     */
+    // Handle the case where we are in column 0 but not on the first
+    // character of the line and the user wants us to show us a
+    // special character (via 'listchars' option "precedes:<char>".
     if (lcs_prec_todo != NUL
         && wp->w_p_list
         && (wp->w_p_wrap ? (wp->w_skipcol > 0 && row == 0) : wp->w_leftcol > 0)
diff --git a/src/nvim/testdir/view_util.vim b/src/nvim/testdir/view_util.vim
index 29ea073f97..520f65c1e7 100644
--- a/src/nvim/testdir/view_util.vim
+++ b/src/nvim/testdir/view_util.vim
@@ -42,6 +42,7 @@ endfunction
 function! NewWindow(height, width) abort
   exe a:height . 'new'
   exe a:width . 'vsp'
+  set winfixwidth winfixheight
   redraw!
 endfunction