File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -774,6 +774,8 @@ static char *(features[]) =
774774
775775static int included_patches [] =
776776{ /* Add new patch number below this line */
777+ /**/
778+ 1565 ,
777779/**/
778780 1564 ,
779781/**/
Original file line number Diff line number Diff line change @@ -2118,16 +2118,19 @@ typedef enum {
21182118# define USE_MCH_ERRMSG
21192119#endif
21202120
2121- /* Whether IME is supported when XIM is not used. */
2122- # if defined(FEAT_MBYTE_IME ) && \
2123- (!defined(FEAT_GUI_W32 ) || !(defined(FEAT_MBYTE_IME ) || defined(GLOBAL_IME )))
2121+ # if (defined(FEAT_MBYTE_IME ) \
2122+ && (!defined(FEAT_GUI_W32 ) \
2123+ || !(defined(FEAT_MBYTE_IME ) || defined(GLOBAL_IME )))) \
2124+ || (defined(MACOS_CONVERT ) && !defined(FEAT_GUI_MAC ))
2125+ /* Whether IME is supported when XIM is not used, im_get_status() is defined in
2126+ * mbyte.c. */
21242127# define IME_WITHOUT_XIM
21252128#endif
21262129
21272130#if defined(FEAT_MBYTE ) && (defined(FEAT_XIM ) \
21282131 || defined(IME_WITHOUT_XIM ) \
21292132 || defined(FEAT_GUI_W32 ) \
2130- || defined(MACOS_CONVERT ))
2133+ || defined(FEAT_GUI_MAC ))
21312134/* im_set_active() is available */
21322135# define HAVE_INPUT_METHOD
21332136#endif
You can’t perform that action at this time.
0 commit comments