patch 7.4.1696

Problem:    When using :stopinsert in a silent mapping the "INSERT" message
            isn't cleared. (Coacher)
Solution:   Always clear the message. (Christian Brabandt, closes #718)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 26f4219521e04d057b6f943046b3a41378dcb2bc..e5de379858e529902fb871d89fbb3399792054dc 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10040,6 +10040,7 @@ ex_stopinsert(exarg_T *eap UNUSED)
 {
     restart_edit = 0;
     stop_insert_mode = TRUE;
+    clearmode();
 }
 
 /*

diff --git a/src/proto/screen.pro b/src/proto/screen.pro
index aad8187a1dc86d407c799e7b9095511de7ab69f1..f8b14c49a91e6d3b36daf32b877d7712f4b76be7 100644 (file)
--- a/src/proto/screen.pro
+++ b/src/proto/screen.pro
@@ -47,6 +47,7 @@ int screen_ins_lines(int off, int row, int line_count, int end, win_T *wp);
 int screen_del_lines(int off, int row, int line_count, int end, int force, win_T *wp);
 int showmode(void);
 void unshowmode(int force);
+void clearmode(void);
 void get_trans_bufname(buf_T *buf);
 int redrawing(void);
 int messaging(void);

diff --git a/src/screen.c b/src/screen.c
index 9d854a225858448818492d3e2885694513a00c29..77fb3b94c5fa9dbe5ef97aea7da27586195687e5 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -10184,12 +10184,19 @@ unshowmode(int force)
     if (!redrawing() || (!force && char_avail() && !KeyTyped))
        redraw_cmdline = TRUE;          /* delete mode later */
     else
-    {
-       msg_pos_mode();
-       if (Recording)
-           recording_mode(hl_attr(HLF_CM));
-       msg_clr_eos();
-    }
+       clearmode();
+}
+
+/*
+ * Clear the mode message.
+ */
+    void
+clearmode()
+{
+    msg_pos_mode();
+    if (Recording)
+       recording_mode(hl_attr(HLF_CM));
+    msg_clr_eos();
 }
 
     static void

diff --git a/src/version.c b/src/version.c
index e7235c15855d3304c051651e2e6af53c8e5ea85a..ab2cc39a40205e8e4b97ff66bf2862b628ab6445 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1696,
 /**/
     1695,
 /**/