Patch 8.0.1567
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.
Files: src/vim.h, src/gui.c
*** ../vim-8.0.1566/src/vim.h 2018-03-04 18:56:59.817710013 +0100
--- src/vim.h 2018-03-04 21:23:56.700732813 +0100
***************
*** 2118,2135 ****
# define USE_MCH_ERRMSG
#endif
! # if (defined(FEAT_MBYTE_IME) \
! && (!defined(FEAT_GUI_W32) \
! || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))) \
! || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC))
! /* Whether IME is supported when XIM is not used, im_get_status() is defined
in
! * mbyte.c. */
# define IME_WITHOUT_XIM
#endif
#if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
|| defined(IME_WITHOUT_XIM) \
- || defined(FEAT_GUI_W32) \
|| defined(FEAT_GUI_MAC))
/* im_set_active() is available */
# define HAVE_INPUT_METHOD
--- 2118,2133 ----
# define USE_MCH_ERRMSG
#endif
! # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
! && ((!defined(FEAT_GUI_W32) \
! || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
! || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)))
! /* Whether IME is supported by im_get_status() defined in mbyte.c. */
# define IME_WITHOUT_XIM
#endif
#if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
|| defined(IME_WITHOUT_XIM) \
|| defined(FEAT_GUI_MAC))
/* im_set_active() is available */
# define HAVE_INPUT_METHOD
*** ../vim-8.0.1566/src/gui.c 2018-03-04 20:14:08.248064341 +0100
--- src/gui.c 2018-03-04 21:12:45.477093287 +0100
***************
*** 1077,1083 ****
gui_undraw_cursor();
if (gui.row < 0)
return;
! #ifdef FEAT_MBYTE
if (gui.row != gui.cursor_row || gui.col != gui.cursor_col)
im_set_position(gui.row, gui.col);
#endif
--- 1077,1083 ----
gui_undraw_cursor();
if (gui.row < 0)
return;
! #ifdef HAVE_INPUT_METHOD
if (gui.row != gui.cursor_row || gui.col != gui.cursor_col)
im_set_position(gui.row, gui.col);
#endif
***************
*** 1135,1141 ****
if (id > 0)
{
cattr = syn_id2colors(id, &cfg, &cbg);
! #if defined(FEAT_MBYTE) || defined(FEAT_HANGULIN)
{
static int iid;
guicolor_T fg, bg;
--- 1135,1141 ----
if (id > 0)
{
cattr = syn_id2colors(id, &cfg, &cbg);
! #if defined(HAVE_INPUT_METHOD) || defined(FEAT_HANGULIN)
{
static int iid;
guicolor_T fg, bg;
*** ../vim-8.0.1566/src/version.c 2018-03-04 20:14:08.256064288 +0100
--- src/version.c 2018-03-04 21:34:27.124631939 +0100
***************
*** 768,769 ****
--- 768,771 ----
{ /* Add new patch number below this line */
+ /**/
+ 1567,
/**/
--
CART DRIVER: Bring out your dead!
There are legs stick out of windows and doors. Two MEN are fighting in the
mud - covered from head to foot in it. Another MAN is on his hands in
knees shovelling mud into his mouth. We just catch sight of a MAN falling
into a well.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- [email protected] -- 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 ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
