summaryrefslogtreecommitdiff
path: root/src/mbyte.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-28 20:16:55 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-28 20:16:55 +0200
commitf0327f67c778f46cdf19d793c013f024f01ea818 (patch)
tree6972cbe3798715dba358aa3e1f15a91edee766a3 /src/mbyte.c
parent22dbc77ef17e67f1c909d76b256425db793eb792 (diff)
downloadvim-git-f0327f67c778f46cdf19d793c013f024f01ea818.tar.gz
updated for version 7.3.1256v7.3.1256
Problem: Can't build without eval or autocmd feature. Solution: Add #ifdefs.
Diffstat (limited to 'src/mbyte.c')
-rw-r--r--src/mbyte.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index 61d83cf01..e0b249862 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -5079,6 +5079,7 @@ xim_reset(void)
{
xim_set_focus(gui.in_focus);
+# ifdef FEAT_EVAL
if (p_imaf[0] != NUL)
{
char_u *argv[1];
@@ -5089,7 +5090,9 @@ xim_reset(void)
argv[0] = (char_u *)"0";
(void)call_func_retnr(p_imaf, 1, argv, FALSE);
}
- else if (im_activatekey_keyval != GDK_VoidSymbol)
+ else
+# endif
+ if (im_activatekey_keyval != GDK_VoidSymbol)
{
if (im_is_active)
{
@@ -5249,12 +5252,17 @@ xim_queue_key_press_event(GdkEventKey *event, int down)
int
im_get_status(void)
{
+# ifdef FEAT_EVAL
if (p_imsf[0] != NUL)
{
int is_active;
/* FIXME: Don't execute user function in unsafe situation. */
- if (exiting || is_autocmd_blocked())
+ if (exiting
+# ifdef FEAT_AUTOCMD
+ || is_autocmd_blocked()
+# endif
+ )
return FALSE;
/* FIXME: :py print 'xxx' is shown duplicate result.
* Use silent to avoid it. */
@@ -5263,6 +5271,7 @@ im_get_status(void)
--msg_silent;
return (is_active > 0);
}
+# endif
return im_is_active;
}