changeset 1567:38de872507e1 v7.1.280

updated for version 7.1-280
author vimboss
date Sat, 15 Mar 2008 12:12:59 +0000
parents 20b4b6a2a212
children 4e581f1b08da
files src/version.c src/vim.h
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 */
 /**/
+    280,
+/**/
     279,
 /**/
     278,
--- a/src/vim.h
+++ b/src/vim.h
@@ -463,7 +463,7 @@ typedef unsigned long u8char_T;	    /* l
  */
 #if defined(FEAT_XIM) \
     || (defined(FEAT_GUI) && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
-    || defined(FEAT_GUI_MAC)
+    || (defined(FEAT_GUI_MAC) && defined(FEAT_MBYTE))
 # define USE_IM_CONTROL
 #endif