summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-09-14 08:25:49 +0000
committerBram Moolenaar <Bram@vim.org>2006-09-14 08:25:49 +0000
commit494c82ae16d0642074fb045ca3b1fd42caa5a721 (patch)
tree66307dfc86dc33a67bddcc127831ddb3d418522c
parentac2adc79f79b75fcbfe2257cd013b2a5d02d99db (diff)
downloadvim-git-7.0.102.tar.gz
updated for version 7.0-102v7.0.102
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index e00663139..35b131d85 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2363,7 +2363,7 @@ redrawcmd_preedit()
{
if ((State & CMDLINE)
&& xic != NULL
- && im_get_status()
+ /* && im_get_status() doesn't work when using SCIM */
&& !p_imdisable
&& im_is_preediting())
{
diff --git a/src/version.c b/src/version.c
index 2565b7ab9..313a66231 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 102,
+/**/
101,
/**/
100,