updated for version 7.1-280

diff --git a/src/version.c b/src/version.c
index 3a9bc0d05f28975e222b818896f51b6eaa4bcf05..9811dda6aa2f73b3c447f6d1de85f9ac859ea9ad 100644 (file)
--- 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 989dd23cef2acb00fe0ce6f6d696009f14cfe563..6c2cde5b02927228545473ef60b1a8163395200e 100644 (file)
--- 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