aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.0.1586: imactivatefunc does not work on non-GUI Mac

Browse Source 
Problem:    Imactivatefunc does not work on non-GUI Mac.
Solution:   Fix logic in #ifdef.
This commit is contained in:
Bram Moolenaar
2018-03-06 18:59:57 +01:00
parent ebf142a1ed
commit 201dc67db5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1586,
/**/ /**/
1585, 1585,
/**/ /**/

3
src/vim.h
View File

@@ -2121,8 +2121,7 @@ typedef enum {
# if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \ # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
&& (!defined(FEAT_GUI_W32) \ && (!defined(FEAT_GUI_W32) \
|| !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
&& !defined(FEAT_GUI_MAC) \ && !(defined(FEAT_GUI_MAC) && defined(MACOS_CONVERT))
&& !defined(MACOS_CONVERT)
/* Whether IME is supported by im_get_status() defined in mbyte.c. /* 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 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 * for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when