summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-05 09:53:23 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-05 09:53:23 +0100
commiteda73607a73fe5ff07eb52981df19c5bae129f70 (patch)
treecd36bd136fd8a7d24ff4d88d99de4a83f8df32a4
parent086329d3f6b1182b6817433a1c498e1e746d2a3b (diff)
downloadvim-git-eda73607a73fe5ff07eb52981df19c5bae129f70.tar.gz
updated for version 7.4.494v7.4.494
Problem: Cursor shape is wrong after a CompleteDone autocommand. Solution: Update the cursor and mouse shape after ":normal" restores the state. (Jacob Niehus)
-rw-r--r--src/ex_docmd.c9
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 15ce34247..35e44f0f3 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9526,8 +9526,15 @@ ex_normal(eap)
msg_didout |= save_msg_didout; /* don't reset msg_didout now */
/* Restore the state (needed when called from a function executed for
- * 'indentexpr'). */
+ * 'indentexpr'). Update the mouse and cursor, they may have changed. */
State = save_State;
+#ifdef FEAT_MOUSE
+ setmouse();
+#endif
+#ifdef CURSOR_SHAPE
+ ui_cursor_shape(); /* may show different cursor shape */
+#endif
+
#ifdef FEAT_MBYTE
vim_free(arg);
#endif
diff --git a/src/version.c b/src/version.c
index 378818e66..ec0e667e2 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 */
/**/
+ 494,
+/**/
493,
/**/
492,