summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-03-07 19:38:55 +0100
committerBram Moolenaar <bram@vim.org>2012-03-07 19:38:55 +0100
commit0d05b220f549aa71b7cb6d1ebde5e31088edeab5 (patch)
treeb7d1f571d22267f1ddc7c46d4e6fd9aace5fcb26
parent1604bf6949ae7407dc6b89034b76740651b5e0ce (diff)
downloadvim-0d05b220f549aa71b7cb6d1ebde5e31088edeab5.tar.gz
updated for version 7.3.467v7.3.467v7-3-467
Problem: Cursor positioned wrong at the command line when regaining focus and using some input method. Solution: Do not position the cursor in command line mode.
-rw-r--r--src/mbyte.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index 2a202f34..75b41ead 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4504,7 +4504,8 @@ im_show_info(void)
vgetc_busy = TRUE;
showmode();
vgetc_busy = old_vgetc_busy;
- setcursor();
+ if ((State & NORMAL) || (State & INSERT))
+ setcursor();
out_flush();
}
diff --git a/src/version.c b/src/version.c
index fca10e99..7a22e46c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 467,
+/**/
466,
/**/
465,