From fe3c41009887331dc9fee2bedf457728117be544 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 31 Oct 2014 12:42:01 +0100
Subject: updated for version 7.4.489 Problem:    Cursor movement still wrong
 when 'lbr' is set and there is a             number column. (Hirohito
 Higashi) Solution:   Add correction for number column. (Hiroyuki Takagi)

---
 src/charset.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/charset.c')

diff --git a/src/charset.c b/src/charset.c
index 918f9a5142..e9745c09a2 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1184,6 +1184,8 @@ win_lbr_chartabsize(wp, line, s, col, headp)
 	{
 	    col -= W_WIDTH(wp);
 	    numberextra = W_WIDTH(wp) - (numberextra - win_col_off2(wp));
+	    if (numberextra > 0)
+		col %= numberextra;
 	    if (*p_sbr != NUL)
 	    {
 		colnr_T sbrlen = (colnr_T)MB_CHARLEN(p_sbr);
-- 
cgit v1.2.3