To: vim_dev@googlegroups.com Subject: Patch 8.0.1581 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1581 Problem: Cannot build Win32 GUI without +eval. Solution: Define HAVE_INPUT_METHOD without +eval. (Ken Takata) Files: src/vim.h *** ../vim-8.0.1580/src/vim.h 2018-03-04 21:35:54.952059810 +0100 --- src/vim.h 2018-03-06 16:09:21.623289435 +0100 *************** *** 2119,2133 **** #endif # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \ ! && ((!defined(FEAT_GUI_W32) \ || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ ! || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC))) ! /* Whether IME is supported by im_get_status() defined in mbyte.c. */ # define IME_WITHOUT_XIM #endif #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ || defined(IME_WITHOUT_XIM) \ || defined(FEAT_GUI_MAC)) /* im_set_active() is available */ # define HAVE_INPUT_METHOD --- 2119,2139 ---- #endif # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \ ! && (!defined(FEAT_GUI_W32) \ || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ ! && !defined(FEAT_GUI_MAC) \ ! && !defined(MACOS_CONVERT) ! /* Whether IME is supported by im_get_status() defined in mbyte.c. ! * For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined. ! * for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when ! * MACOS_CONVERT is defined. */ # define IME_WITHOUT_XIM #endif #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ || defined(IME_WITHOUT_XIM) \ + || (defined(FEAT_GUI_W32) \ + && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ || defined(FEAT_GUI_MAC)) /* im_set_active() is available */ # define HAVE_INPUT_METHOD *** ../vim-8.0.1580/src/version.c 2018-03-06 15:06:15.314321664 +0100 --- src/version.c 2018-03-06 16:01:18.498200752 +0100 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1581, /**/ -- | Ceci n'est pas une pipe. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///