File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -774,6 +774,8 @@ static char *(features[]) =
774
774
775
775
static int included_patches [] =
776
776
{ /* Add new patch number below this line */
777
+ /**/
778
+ 1565 ,
777
779
/**/
778
780
1564 ,
779
781
/**/
Original file line number Diff line number Diff line change @@ -2118,16 +2118,19 @@ typedef enum {
2118
2118
# define USE_MCH_ERRMSG
2119
2119
#endif
2120
2120
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. */
2124
2127
# define IME_WITHOUT_XIM
2125
2128
#endif
2126
2129
2127
2130
#if defined(FEAT_MBYTE ) && (defined(FEAT_XIM ) \
2128
2131
|| defined(IME_WITHOUT_XIM ) \
2129
2132
|| defined(FEAT_GUI_W32 ) \
2130
- || defined(MACOS_CONVERT ))
2133
+ || defined(FEAT_GUI_MAC ))
2131
2134
/* im_set_active() is available */
2132
2135
# define HAVE_INPUT_METHOD
2133
2136
#endif
You can’t perform that action at this time.
0 commit comments