aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelipe Morales <hel.sheep@gmail.com>2014-11-21 13:18:22 -0300
committerFelipe Morales <hel.sheep@gmail.com>2014-11-27 19:40:51 -0300
commit42dc00b767333576b97280a69d924afbb4326155 (patch)
tree7df617a3d0248b77c4134bebd8dfee8c6506a682 /src
parent35e23984417e5dfcb88c56c4301cc60e856a97cd (diff)
downloadrneovim-42dc00b767333576b97280a69d924afbb4326155.tar.gz
rneovim-42dc00b767333576b97280a69d924afbb4326155.tar.bz2
rneovim-42dc00b767333576b97280a69d924afbb4326155.zip
vim-patch:7.4.472: Only draw "precedes" entry in 'listchar' when 'list' is on
vim-patch:7.4.472 Problem: The "precedes" entry in 'listchar' will be drawn when 'showbreak is set and list is not. Solution: Only draw this character when 'list' is on. (Christian Brabandt) https://code.google.com/p/vim/source/detail?r=af998690a8841d4df95cea0bed4246f2ba98e247
Diffstat (limited to 'src')
-rw-r--r--src/nvim/screen.c1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 164b8e7f7d..73df08aac9 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3730,6 +3730,7 @@ win_line (
* special character (via 'listchars' option "precedes:<char>".
*/
if (lcs_prec_todo != NUL
+ && wp->w_p_list
&& (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0)
&& filler_todo <= 0
&& draw_state > WL_NR
diff --git a/src/nvim/version.c b/src/nvim/version.c
index e4ad77b367..d2895a14fa 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -194,7 +194,7 @@ static int included_patches[] = {
//475,
//474,
//473,
- //472,
+ 472,
//471,
//470,
//469,