To: vim_dev@googlegroups.com Subject: Patch 8.0.1565 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1565 Problem: Can't build Mac version without GUI. Solution: Adjust when IME_WITHOUT_XIM is defined. Files: src/vim.h *** ../vim-8.0.1564/src/vim.h 2018-03-04 18:07:04.272592321 +0100 --- src/vim.h 2018-03-04 18:53:46.054942464 +0100 *************** *** 2118,2133 **** # define USE_MCH_ERRMSG #endif ! /* Whether IME is supported when XIM is not used. */ ! # if defined(FEAT_MBYTE_IME) && \ ! (!defined(FEAT_GUI_W32) || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) # define IME_WITHOUT_XIM #endif #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ || defined(IME_WITHOUT_XIM) \ || defined(FEAT_GUI_W32) \ ! || defined(MACOS_CONVERT)) /* im_set_active() is available */ # define HAVE_INPUT_METHOD #endif --- 2118,2136 ---- # define USE_MCH_ERRMSG #endif ! # if (defined(FEAT_MBYTE_IME) \ ! && (!defined(FEAT_GUI_W32) \ ! || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))) \ ! || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)) ! /* Whether IME is supported when XIM is not used, im_get_status() is defined in ! * mbyte.c. */ # define IME_WITHOUT_XIM #endif #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ || defined(IME_WITHOUT_XIM) \ || defined(FEAT_GUI_W32) \ ! || defined(FEAT_GUI_MAC)) /* im_set_active() is available */ # define HAVE_INPUT_METHOD #endif *** ../vim-8.0.1564/src/version.c 2018-03-04 18:07:04.288592219 +0100 --- src/version.c 2018-03-04 18:56:29.845900544 +0100 *************** *** 776,777 **** --- 776,779 ---- { /* Add new patch number below this line */ + /**/ + 1565, /**/ -- ./configure Checking whether build environment is sane ... build environment is grinning and holding a spatula. Guess not. /// 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 ///