From 21afabb9e8cf335fb60c027bbb064de07d1bf586 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Thu, 14 Jan 2016 10:58:12 +0100
Subject: vim-patch:7.4.729

Problem:    Occasional crash with 'list' set.
Solution:   Fix off-by-one error. (Christian Brabandt)
---
 src/nvim/screen.c  | 2 +-
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 1ae2822a93..700612900a 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3469,7 +3469,7 @@ win_line (
                            && !(noinvcur
                                 && lnum == wp->w_cursor.lnum
                                 && (colnr_T)vcol == wp->w_virtcol)))
-                   && lcs_eol_one >= 0) {
+                   && lcs_eol_one > 0) {
           /* Display a '$' after the line or highlight an extra
            * character if the line break is included. */
           /* For a diff line the highlighting continues after the
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 8c9faac0c3..e221001e35 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -395,7 +395,7 @@ static int included_patches[] = {
   // 732,
   // 731 NA
   // 730 NA
-  // 729,
+  729,
   // 728 NA
   // 727 NA
   // 726 NA
-- 
cgit 


From 1c91dc8a5ee83173474b31b8a0073a0368944914 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Fri, 15 Jan 2016 09:04:46 +0100
Subject: screen: Fix linting errors

---
 src/nvim/screen.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 700612900a..ed02c28272 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3470,10 +3470,10 @@ win_line (
                                 && lnum == wp->w_cursor.lnum
                                 && (colnr_T)vcol == wp->w_virtcol)))
                    && lcs_eol_one > 0) {
-          /* Display a '$' after the line or highlight an extra
-           * character if the line break is included. */
-          /* For a diff line the highlighting continues after the
-           * "$". */
+          // Display a '$' after the line or highlight an extra
+          // character if the line break is included.
+          // For a diff line the highlighting continues after the
+          // "$".
           if (diff_hlf == (hlf_T)0 && line_attr == 0) {
             /* In virtualedit, visual selections may extend
              * beyond end of line. */
-- 
cgit