updated for version 7.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().

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index df6700d64b776f7e3629684ab2240a7f5f31b0b8..2a81eb739895a749c0a9a447763a9a7ead9d639a 100644 (file)
--- 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 ee2598d8b2da4e4f93393c867bb791d2151dedec..b2c3289c65d67efc03423130210482f05716d524 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    418,
 /**/
     417,
 /**/