From 0dd1ad0760ecdbfeef94da4ef33d71e66eab35b3 Mon Sep 17 00:00:00 2001
From: oni-link <knil.ino@gmail.com>
Date: Wed, 4 Mar 2015 17:57:47 +0100
Subject: vim-patch:7.4.578

Problem:    Using getcurpos() after "$" in an empty line returns a negative
            number.
Solution:   Don't add one when this would overflow. (Hirohito Higashi)

https://code.google.com/p/vim/source/detail?r=v7-4-578
---
 src/nvim/eval.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/nvim/eval.c')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 87bd058c9e..9b4b4ce496 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -9479,7 +9479,9 @@ static void getpos_both(typval_T *argvars, typval_T *rettv, bool getcurpos)
   list_append_number(l,
                      (fp != NULL) ? (varnumber_T)fp->coladd : (varnumber_T)0);
   if (getcurpos) {
-    list_append_number(l, (varnumber_T) curwin->w_curswant + 1);
+    list_append_number(l, curwin->w_curswant == MAXCOL
+                              ? (varnumber_T)MAXCOL
+                              : (varnumber_T)curwin->w_curswant + 1);
   }
 }
 
-- 
cgit