summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-08-29 09:02:27 +0200
committerBram Moolenaar <Bram@vim.org>2014-08-29 09:02:27 +0200
commit26f08b06b681085e8f40b109871fe7ae2f3bd7c6 (patch)
tree7bd221a8529c606d0f8d160fa9d178e757d78f51
parent285ed7e049dc50c61672fb835752643bd01ed1ca (diff)
updated for version 7.4.418v7.4.418
Problem: When leaving ":append" the cursor shape is like in Insert mode. (Jacob Niehus) Solution: Do not have State set to INSERT when calling getline().
-rw-r--r--src/ex_cmds.c8
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index df6700d64b..2a81eb7398 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4011,11 +4011,19 @@ ex_append(eap)
eap->nextcmd = p;
}
else
+ {
+ int save_State = State;
+
+ /* Set State to avoid the cursor shape to be set to INSERT mode
+ * when getline() returns. */
+ State = CMDLINE;
theline = eap->getline(
#ifdef FEAT_EVAL
eap->cstack->cs_looplevel > 0 ? -1 :
#endif
NUL, eap->cookie, indent);
+ State = save_State;
+ }
lines_left = Rows - 1;
if (theline == NULL)
break;
diff --git a/src/version.c b/src/version.c
index ee2598d8b2..b2c3289c65 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 */
/**/
+ 418,
+/**/
417,
/**/
416,