0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

updated for version 7.3.1256

Problem:    Can't build without eval or autocmd feature.
Solution:   Add #ifdefs.
This commit is contained in:
Bram Moolenaar
2013-06-28 20:16:55 +02:00
parent 22dbc77ef1
commit f0327f67c7
3 changed files with 17 additions and 4 deletions

View File

@@ -5079,6 +5079,7 @@ xim_reset(void)
{ {
xim_set_focus(gui.in_focus); xim_set_focus(gui.in_focus);
# ifdef FEAT_EVAL
if (p_imaf[0] != NUL) if (p_imaf[0] != NUL)
{ {
char_u *argv[1]; char_u *argv[1];
@@ -5089,7 +5090,9 @@ xim_reset(void)
argv[0] = (char_u *)"0"; argv[0] = (char_u *)"0";
(void)call_func_retnr(p_imaf, 1, argv, FALSE); (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) if (im_is_active)
{ {
@@ -5249,12 +5252,17 @@ xim_queue_key_press_event(GdkEventKey *event, int down)
int int
im_get_status(void) im_get_status(void)
{ {
# ifdef FEAT_EVAL
if (p_imsf[0] != NUL) if (p_imsf[0] != NUL)
{ {
int is_active; int is_active;
/* FIXME: Don't execute user function in unsafe situation. */ /* 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; return FALSE;
/* FIXME: :py print 'xxx' is shown duplicate result. /* FIXME: :py print 'xxx' is shown duplicate result.
* Use silent to avoid it. */ * Use silent to avoid it. */
@@ -5263,6 +5271,7 @@ im_get_status(void)
--msg_silent; --msg_silent;
return (is_active > 0); return (is_active > 0);
} }
# endif
return im_is_active; return im_is_active;
} }

View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1256,
/**/ /**/
1255, 1255,
/**/ /**/

View File

@@ -6928,6 +6928,7 @@ get_tab_number(tabpage_T *tp UNUSED)
} }
#endif #endif
#ifdef FEAT_WINDOWS
/* /*
* Return TRUE if "topfrp" and its children are at the right height. * Return TRUE if "topfrp" and its children are at the right height.
*/ */
@@ -6948,6 +6949,7 @@ frame_check_height(topfrp, height)
return TRUE; return TRUE;
} }
#endif
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
/* /*