commit 4c4f7105d26a018cd7ec674105082d99ea3420c4
author Bram Moolenaar <Bram@vim.org> Sat Mar 15 12:12:59 2008 +0000
committer Bram Moolenaar <Bram@vim.org> Sat Mar 15 12:12:59 2008 +0000
tree 6ee07408144788502d0b84bfefd849db1f889643
parent 7dc767c8d503e8922c44879491e4c6793cdc7c04

updated for version 7.1-280

src/version.c

diff --git a/src/version.c b/src/version.c
index 3a9bc0d..9811dda 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    280,
+/**/
     279,
 /**/
     278,

src/vim.h

diff --git a/src/vim.h b/src/vim.h
index 989dd23..6c2cde5 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -463,7 +463,7 @@
  */
 #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