From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 15 Mar 2008 12:12:59 +0000 (+0000)
Subject: updated for version 7.1-280
X-Git-Tag: v7.1.280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c4f7105d26a018cd7ec674105082d99ea3420c4;p=vim

updated for version 7.1-280
---

diff --git a/src/version.c b/src/version.c
index 3a9bc0d05..9811dda6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    280,
 /**/
     279,
 /**/
diff --git a/src/vim.h b/src/vim.h
index 989dd23ce..6c2cde5b0 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -463,7 +463,7 @@ typedef unsigned long u8char_T;	    /* long should be 32 bits or more */
  */
 #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