From ed464908e491234e4c474cb0277142f55532944e Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Thu, 23 Apr 2015 07:06:12 +0200
Subject: version.c: Add new patch numbers

---
 src/nvim/version.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index d1ba6e473e..037cf9f71b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -67,6 +67,16 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
+  //712,
+  //711,
+  //710,
+  //709,
+  //708,
+  //707,
+  //706,
+  //705,
+  //704,
+  //703,
   702,
   //701,
   //700,
-- 
cgit 


From 7f0764629495a5e0568ee625e8f89a8121235940 Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Thu, 23 Apr 2015 06:58:20 +0200
Subject: vim-patch:7.4.710
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    It is not possible to make spaces visibible in list mode.
Solution:   Add the "space" item to 'listchars'. (David Bürgin, issue 350)

https://github.com/vim/vim/releases/tag/v7-4-710

Closes #2485.
---
 src/nvim/globals.h |  1 +
 src/nvim/screen.c  | 10 +++++-----
 src/nvim/version.c |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index a8c97c800d..832377f488 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -998,6 +998,7 @@ EXTERN int lcs_eol INIT(= '$');
 EXTERN int lcs_ext INIT(= NUL);
 EXTERN int lcs_prec INIT(= NUL);
 EXTERN int lcs_nbsp INIT(= NUL);
+EXTERN int lcs_space INIT(= NUL);
 EXTERN int lcs_tab1 INIT(= NUL);
 EXTERN int lcs_tab2 INIT(= NUL);
 EXTERN int lcs_trail INIT(= NUL);
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index c9a2e147dc..a680599f9b 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3165,11 +3165,11 @@ win_line (
       }
       ++ptr;
 
-      /* 'list' : change char 160 to lcs_nbsp. */
-      if (wp->w_p_list && (c == 160
-                           || (mb_utf8 && mb_c == 160)
-                           ) && lcs_nbsp) {
-        c = lcs_nbsp;
+      // 'list': change char 160 to lcs_nbsp and space to lcs_space.
+      if (wp->w_p_list
+          && (((c == 160 || (mb_utf8 && mb_c == 160)) && lcs_nbsp)
+              || (c == ' ' && lcs_space && ptr <= line + trailcol))) {
+        c = (c == ' ') ? lcs_space : lcs_nbsp;
         if (area_attr == 0 && search_attr == 0) {
           n_attr = 1;
           extra_attr = hl_attr(HLF_8);
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 037cf9f71b..50e4033b4b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -69,7 +69,7 @@ static char *features[] = {
 static int included_patches[] = {
   //712,
   //711,
-  //710,
+  710,
   //709,
   //708,
   //707,
-- 
cgit 


From b52deb6cc81c75ef5bc1a62f2abcaf46e682f323 Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Thu, 23 Apr 2015 18:53:10 +0200
Subject: vim-patch:7.4.711

Problem:    Missing change in one file.
Solution:   Also change option.c

https://github.com/vim/vim/releases/tag/v7-4-711
---
 src/nvim/option.c  | 1 +
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/option.c b/src/nvim/option.c
index 12118cdebc..7c28064ea0 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4502,6 +4502,7 @@ static char_u *set_chars_option(char_u **varp)
     {&lcs_ext,      "extends"},
     {&lcs_nbsp,     "nbsp"},
     {&lcs_prec,     "precedes"},
+    {&lcs_space,    "space"},
     {&lcs_tab2,     "tab"},
     {&lcs_trail,    "trail"},
     {&lcs_conceal,  "conceal"},
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 50e4033b4b..1595abffbf 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -68,7 +68,7 @@ static char *features[] = {
 // clang-format off
 static int included_patches[] = {
   //712,
-  //711,
+  711,
   710,
   //709,
   //708,
-- 
cgit 


From 2632dc5890744085e8cb24a644a50f7e32a92c03 Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Thu, 23 Apr 2015 18:58:31 +0200
Subject: vim-patch:7.4.712

Problem:    Missing change in another file.
Solution:   Also change message.c

https://github.com/vim/vim/releases/tag/v7-4-712
---
 src/nvim/message.c | 3 +++
 src/nvim/version.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 52b023dc5e..5efa9f6549 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1450,6 +1450,9 @@ void msg_prt_line(char_u *s, int list)
       } else if (c == ' ' && trail != NULL && s > trail) {
         c = lcs_trail;
         attr = hl_attr(HLF_8);
+      } else if (c == ' ' && list && lcs_space != NUL) {
+        c = lcs_space;
+        attr = hl_attr(HLF_8);
       }
     }
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1595abffbf..a6a86f09d1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -67,7 +67,7 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
-  //712,
+  712,
   711,
   710,
   //709,
-- 
cgit