summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_getln.c8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index a5975e986..206da8065 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2095,11 +2095,11 @@ getexmodeline(promptc, dummy, indent)
garray_T line_ga;
char_u *pend;
int startcol = 0;
- int c1;
+ int c1 = 0;
int escaped = FALSE; /* CTRL-V typed */
int vcol = 0;
char_u *p;
- int prev_char = 0;
+ int prev_char;
/* Switch cursor on now. This avoids that it happens after the "\n", which
* confuses the system function that computes tabstops. */
@@ -2152,6 +2152,7 @@ getexmodeline(promptc, dummy, indent)
/* Get one character at a time. Don't use inchar(), it can't handle
* special characters. */
+ prev_char = c1;
c1 = vgetc();
/*
@@ -2209,7 +2210,6 @@ add_indent:
redraw:
/* redraw the line */
msg_col = startcol;
- windgoto(msg_row, msg_col);
vcol = 0;
for (p = (char_u *)line_ga.ga_data;
p < (char_u *)line_ga.ga_data + line_ga.ga_len; ++p)
@@ -2228,6 +2228,7 @@ redraw:
}
}
msg_clr_eos();
+ windgoto(msg_row, msg_col);
continue;
}
@@ -2273,7 +2274,6 @@ redraw:
if (IS_SPECIAL(c1))
c1 = '?';
((char_u *)line_ga.ga_data)[line_ga.ga_len] = c1;
- prev_char = c1;
if (c1 == '\n')
msg_putchar('\n');
else if (c1 == TAB)
diff --git a/src/version.c b/src/version.c
index 92b1cb619..c3f9bc520 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 43,
+/**/
42,
/**/
41,