From 8992f8b1c7388f4a30315d647244f00f09861ec7 Mon Sep 17 00:00:00 2001
From: Andrea Cedraro <a.cedraro@gmail.com>
Date: Wed, 10 Jun 2015 14:58:03 +0200
Subject: vim-patch:7.4.719 #2817

Problem:    Overflow when adding MAXCOL to a pointer.
Solution:   Subtract pointers instead. (James McCoy)

https://github.com/vim/vim/commit/v7-4-719
---
 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 7a6e3c59c0..43cb6f4878 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3173,7 +3173,7 @@ win_line (
       // '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 == ' ' && lcs_space && ptr - line <=  trailcol))) {
         c = (c == ' ') ? lcs_space : lcs_nbsp;
         if (area_attr == 0 && search_attr == 0) {
           n_attr = 1;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d43108d29a..e7ba6b6153 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -90,7 +90,7 @@ static int included_patches[] = {
   //722,
   //721,
   //720 NA
-  //719,
+  719,
   //718,
   //717,
   //716,
-- 
cgit