Merge pull request #5641 from Shougo/vim-7.4.1696

vim-patch:7.4.1696

src/nvim/edit.c

@@ -2322,7 +2322,6 @@ static int ins_compl_make_cyclic(void)
   return count;
 }
 
-
 // Set variables that store noselect and noinsert behavior from the
 // 'completeopt' value.
 void completeopt_was_set(void)

src/nvim/ex_docmd.c

@@ -7970,7 +7970,8 @@ static void ex_startinsert(exarg_T *eap)
 static void ex_stopinsert(exarg_T *eap)
 {
   restart_edit = 0;
-  stop_insert_mode = TRUE;
+  stop_insert_mode = true;
+  clearmode();
 }
 
 /*

src/nvim/screen.c

@@ -6827,12 +6827,18 @@ void unshowmode(bool force)
   if (!redrawing() || (!force && char_avail() && !KeyTyped)) {
     redraw_cmdline = true;  // delete mode later
   } else {
+    clearmode();
+  }
+}
+
+// Clear the mode message.
+void clearmode(void)
+{
     msg_pos_mode();
     if (Recording) {
       recording_mode(hl_attr(HLF_CM));
     }
     msg_clr_eos();
-  }
 }
 
 static void recording_mode(int attr)

src/nvim/version.c

@@ -748,7 +748,7 @@ static int included_patches[] = {
   // 1699,
   // 1698 NA
   1697,
-  // 1696,
+  1696,
   1695,
   // 1694 NA
   // 1693 NA