diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-06 14:55:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-06 14:55:19 +0200 |
| commit | b5a7fd083c32216522b86d55345e343200710a99 (patch) | |
| tree | 9b884641d83b6fe21d85bd825e869cbb5a3a86a0 | |
| parent | ab3aa6d2b968761ef6ce0dded3d4b1fefb3f37b6 (diff) | |
| download | vim-7-3-1130.tar.gz | |
Problem: Can't build with anything but huge features.
Solution: Check for FEAT_PROFILE. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/structs.h | 4 | ||||
| -rw-r--r-- | src/syntax.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 9b8bf892..6b616ca8 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -242,7 +242,7 @@ static void ex_popup __ARGS((exarg_T *eap)); # define ex_syntax ex_ni # define ex_ownsyntax ex_ni #endif -#if !defined(FEAT_SYN_HL) || !defined(FEAT_RELTIME) +#if !defined(FEAT_SYN_HL) || !defined(FEAT_PROFILE) # define ex_syntime ex_ni #endif #ifndef FEAT_SPELL diff --git a/src/structs.h b/src/structs.h index 20b12baf..4f38ad9e 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1206,7 +1206,7 @@ struct dictvar_S typedef struct qf_info_S qf_info_T; #endif -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE /* * Used for :syntime: timing of executing a syntax pattern. */ @@ -1242,7 +1242,7 @@ typedef struct { long b_syn_sync_linebreaks; /* offset for multi-line pattern */ char_u *b_syn_linecont_pat; /* line continuation pattern */ regprog_T *b_syn_linecont_prog; /* line continuation program */ -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE syn_time_T b_syn_linecont_time; #endif int b_syn_linecont_ic; /* ignore-case flag for above */ diff --git a/src/syntax.c b/src/syntax.c index 6616e788..90b54afd 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -153,7 +153,7 @@ typedef struct syn_pattern short sp_syn_match_id; /* highlight group ID of pattern */ char_u *sp_pattern; /* regexp to match, pattern */ regprog_T *sp_prog; /* regexp to match, program */ -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE syn_time_T sp_time; #endif int sp_ic; /* ignore-case flag for sp_prog */ @@ -400,7 +400,7 @@ static short *copy_id_list __ARGS((short *list)); static int in_id_list __ARGS((stateitem_T *item, short *cont_list, struct sp_syn *ssp, int contained)); static int push_current_state __ARGS((int idx)); static void pop_current_state __ARGS((void)); -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE static void syn_clear_time __ARGS((syn_time_T *tt)); static void syntime_clear __ARGS((void)); #ifdef __BORLANDC__ @@ -3261,7 +3261,7 @@ syn_regexec(rmp, lnum, col, st) syn_time_T *st; { int r; -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE proftime_T pt; if (syn_time_on) @@ -3271,7 +3271,7 @@ syn_regexec(rmp, lnum, col, st) rmp->rmm_maxcol = syn_buf->b_p_smc; r = vim_regexec_multi(rmp, syn_win, syn_buf, lnum, col, NULL); -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE if (syn_time_on) { profile_end(&pt); @@ -5658,7 +5658,7 @@ get_syn_pattern(arg, ci) if (ci->sp_prog == NULL) return NULL; ci->sp_ic = curwin->w_s->b_syn_ic; -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE syn_clear_time(&ci->sp_time); #endif @@ -5837,7 +5837,7 @@ syn_cmd_sync(eap, syncing) curwin->w_s->b_syn_linecont_prog = vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC); p_cpo = cpo_save; -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE syn_clear_time(&curwin->w_s->b_syn_linecont_time); #endif @@ -6526,7 +6526,7 @@ syn_get_foldlevel(wp, lnum) } #endif -#ifdef FEAT_RELTIME +#ifdef FEAT_PROFILE /* * ":syntime". */ diff --git a/src/version.c b/src/version.c index a16cfa1c..ec88b8d1 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1130, +/**/ 1129, /**/ 1128, |