Mercurial > vim

comparison src/mbyte.c @ 12948:851393938fa3 v8.0.1350

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1350: cannot build with +eval and -multi_byte commit https://github.com/vim/vim/commit/1355aad2b94790217aeef9077d3fb9925461f137 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Nov 27 22:49:01 2017 +0100 patch 8.0.1350: cannot build with +eval and -multi_byte Problem: Cannot build with +eval and -multi_byte. Solution: Adjust #ifdefs. (John Marriott) Always include the multi_byte feature when an input method feature is enabled.
author Christian Brabandt <cb@256bit.org>
date Mon, 27 Nov 2017 23:00:04 +0100
parents c53a80f39a52
children cfaa513efa3f
comparison
equal deleted inserted replaced
12947:f3384119229e 12948:851393938fa3
4788 #else 4788 #else
4789 # define USE_IMACTIVATEFUNC (*p_imaf != NUL) 4789 # define USE_IMACTIVATEFUNC (*p_imaf != NUL)
4790 # define USE_IMSTATUSFUNC (*p_imsf != NUL) 4790 # define USE_IMSTATUSFUNC (*p_imsf != NUL)
4791 #endif 4791 #endif
4792 4792
4793 #ifdef FEAT_EVAL 4793 #if defined(FEAT_EVAL) && defined(FEAT_MBYTE)
4794 static void 4794 static void
4795 call_imactivatefunc(int active) 4795 call_imactivatefunc(int active)
4796 { 4796 {
4797 char_u *argv[1]; 4797 char_u *argv[1];
4798 4798
6484 static int im_was_set_active = FALSE; 6484 static int im_was_set_active = FALSE;
6485 6485
6486 int 6486 int
6487 im_get_status() 6487 im_get_status()
6488 { 6488 {
6489 # ifdef FEAT_EVAL 6489 # if defined(FEAT_MBYTE) && defined(FEAT_EVAL)
6490 if (USE_IMSTATUSFUNC) 6490 if (USE_IMSTATUSFUNC)
6491 return call_imstatusfunc(); 6491 return call_imstatusfunc();
6492 # endif 6492 # endif
6493 return im_was_set_active; 6493 return im_was_set_active;
6494 } 6494 }