# HG changeset patch
# User vimboss
# Date 1205583179 0
# Node ID 38de872507e1c6440c9252a7bad077ae8c1bd488
# Parent  20b4b6a2a212584f182a2d69a37512bf9094d85e
updated for version 7.1-280

diff --git a/src/version.c b/src/version.c
--- 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,
diff --git a/src/vim.h b/src/vim.h
--- 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