Mercurial > vim
comparison src/gui.c @ 13386:bf3de2fd98fa v8.0.1567
patch 8.0.1567: cannot build Win32 GUI without IME
commit https://github.com/vim/vim/commit/6e35a11490f1f9061677671220ce4cb73176b44a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 4 21:36:05 2018 +0100
patch 8.0.1567: cannot build Win32 GUI without IME
Problem: Cannot build Win32 GUI without IME. (John Marriott)
Solution: Adjust when IME_WITHOUT_XIM and HAVE_INPUT_METHOD are defined and
use it in a few more places.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 04 Mar 2018 21:45:05 +0100 |
| parents | 6740c499de13 |
| children | fa0dcdaec6a3 |
comparison
equal
deleted
inserted
replaced
| 13385:6ce6daf93141 | 13386:bf3de2fd98fa |
|---|---|
| 1075 || gui.row != gui.cursor_row || gui.col != gui.cursor_col) | 1075 || gui.row != gui.cursor_row || gui.col != gui.cursor_col) |
| 1076 { | 1076 { |
| 1077 gui_undraw_cursor(); | 1077 gui_undraw_cursor(); |
| 1078 if (gui.row < 0) | 1078 if (gui.row < 0) |
| 1079 return; | 1079 return; |
| 1080 #ifdef FEAT_MBYTE | 1080 #ifdef HAVE_INPUT_METHOD |
| 1081 if (gui.row != gui.cursor_row || gui.col != gui.cursor_col) | 1081 if (gui.row != gui.cursor_row || gui.col != gui.cursor_col) |
| 1082 im_set_position(gui.row, gui.col); | 1082 im_set_position(gui.row, gui.col); |
| 1083 #endif | 1083 #endif |
| 1084 gui.cursor_row = gui.row; | 1084 gui.cursor_row = gui.row; |
| 1085 gui.cursor_col = gui.col; | 1085 gui.cursor_col = gui.col; |
| 1133 else | 1133 else |
| 1134 #endif | 1134 #endif |
| 1135 if (id > 0) | 1135 if (id > 0) |
| 1136 { | 1136 { |
| 1137 cattr = syn_id2colors(id, &cfg, &cbg); | 1137 cattr = syn_id2colors(id, &cfg, &cbg); |
| 1138 #if defined(FEAT_MBYTE) || defined(FEAT_HANGULIN) | 1138 #if defined(HAVE_INPUT_METHOD) || defined(FEAT_HANGULIN) |
| 1139 { | 1139 { |
| 1140 static int iid; | 1140 static int iid; |
| 1141 guicolor_T fg, bg; | 1141 guicolor_T fg, bg; |
| 1142 | 1142 |
| 1143 if ( | 1143 if ( |