To: vim_dev@googlegroups.com Subject: Patch 8.0.1586 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1586 Problem: Imactivatefunc does not work on non-GUI Mac. Solution: Fix logic in #ifdef. Files: src/vim.h *** ../vim-8.0.1585/src/vim.h 2018-03-06 16:11:42.910436897 +0100 --- src/vim.h 2018-03-06 18:57:39.682362477 +0100 *************** *** 2121,2128 **** # 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 --- 2121,2127 ---- # 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 *** ../vim-8.0.1585/src/version.c 2018-03-06 18:19:58.984041839 +0100 --- src/version.c 2018-03-06 18:59:11.657801282 +0100 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1586, /**/ -- ALL: A witch! A witch! WITCH: It's a fair cop. ALL: Burn her! Burn her! Let's make her into a ladder. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///