summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-31 12:42:01 +0100
committerBram Moolenaar <Bram@vim.org>2014-10-31 12:42:01 +0100
commitfe3c41009887331dc9fee2bedf457728117be544 (patch)
tree8b1d51cd7326264a77bc31f71cde7d517de7d49c
parent7a373dd0d49b3dd992e7999bb368d0b307d70662 (diff)
updated for version 7.4.489v7.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)
-rw-r--r--src/charset.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
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);
diff --git a/src/version.c b/src/version.c
index e720782c79..1ef081855a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 489,
+/**/
488,
/**/
487,