thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.1130

Browse Source 
Problem:    Can't build with anything but huge features.
Solution:   Check for FEAT_PROFILE. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2013-06-06 14:55:19 +02:00
parent 8a7f5a2d43
commit f751255283
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_docmd.c
View File

@@ -242,7 +242,7 @@ static void ex_popup __ARGS((exarg_T *eap));
# define ex_syntax ex_ni # define ex_syntax ex_ni
# define ex_ownsyntax ex_ni # define ex_ownsyntax ex_ni
#endif #endif
#if !defined(FEAT_SYN_HL) || !defined(FEAT_RELTIME) #if !defined(FEAT_SYN_HL) || !defined(FEAT_PROFILE)
# define ex_syntime ex_ni # define ex_syntime ex_ni
#endif #endif
#ifndef FEAT_SPELL #ifndef FEAT_SPELL

4
src/structs.h
View File

@@ -1206,7 +1206,7 @@ struct dictvar_S
typedef struct qf_info_S qf_info_T; typedef struct qf_info_S qf_info_T;
#endif #endif
#ifdef FEAT_RELTIME #ifdef FEAT_PROFILE
/* /*
* Used for :syntime: timing of executing a syntax pattern. * 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 */ long b_syn_sync_linebreaks; /* offset for multi-line pattern */
char_u *b_syn_linecont_pat; /* line continuation pattern */ char_u *b_syn_linecont_pat; /* line continuation pattern */
regprog_T *b_syn_linecont_prog; /* line continuation program */ regprog_T *b_syn_linecont_prog; /* line continuation program */
#ifdef FEAT_RELTIME #ifdef FEAT_PROFILE
syn_time_T b_syn_linecont_time; syn_time_T b_syn_linecont_time;
#endif #endif
int b_syn_linecont_ic; /* ignore-case flag for above */ int b_syn_linecont_ic; /* ignore-case flag for above */

14
src/syntax.c
View File

@@ -153,7 +153,7 @@ typedef struct syn_pattern
short sp_syn_match_id; /* highlight group ID of pattern */ short sp_syn_match_id; /* highlight group ID of pattern */
char_u *sp_pattern; /* regexp to match, pattern */ char_u *sp_pattern; /* regexp to match, pattern */
regprog_T *sp_prog; /* regexp to match, program */ regprog_T *sp_prog; /* regexp to match, program */
#ifdef FEAT_RELTIME #ifdef FEAT_PROFILE
syn_time_T sp_time; syn_time_T sp_time;
#endif #endif
int sp_ic; /* ignore-case flag for sp_prog */ 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 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 int push_current_state __ARGS((int idx));
static void pop_current_state __ARGS((void)); 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 syn_clear_time __ARGS((syn_time_T *tt));
static void syntime_clear __ARGS((void)); static void syntime_clear __ARGS((void));
#ifdef __BORLANDC__ #ifdef __BORLANDC__
@@ -3261,7 +3261,7 @@ syn_regexec(rmp, lnum, col, st)
syn_time_T *st; syn_time_T *st;
{ {
int r; int r;
#ifdef FEAT_RELTIME #ifdef FEAT_PROFILE
proftime_T pt; proftime_T pt;
if (syn_time_on) if (syn_time_on)
@@ -3271,7 +3271,7 @@ syn_regexec(rmp, lnum, col, st)
rmp->rmm_maxcol = syn_buf->b_p_smc; rmp->rmm_maxcol = syn_buf->b_p_smc;
r = vim_regexec_multi(rmp, syn_win, syn_buf, lnum, col, NULL); r = vim_regexec_multi(rmp, syn_win, syn_buf, lnum, col, NULL);
#ifdef FEAT_RELTIME #ifdef FEAT_PROFILE
if (syn_time_on) if (syn_time_on)
{ {
profile_end(&pt); profile_end(&pt);
@@ -5658,7 +5658,7 @@ get_syn_pattern(arg, ci)
if (ci->sp_prog == NULL) if (ci->sp_prog == NULL)
return NULL; return NULL;
ci->sp_ic = curwin->w_s->b_syn_ic; ci->sp_ic = curwin->w_s->b_syn_ic;
#ifdef FEAT_RELTIME #ifdef FEAT_PROFILE
syn_clear_time(&ci->sp_time); syn_clear_time(&ci->sp_time);
#endif #endif
@@ -5837,7 +5837,7 @@ syn_cmd_sync(eap, syncing)
curwin->w_s->b_syn_linecont_prog = curwin->w_s->b_syn_linecont_prog =
vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC); vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC);
p_cpo = cpo_save; p_cpo = cpo_save;
#ifdef FEAT_RELTIME #ifdef FEAT_PROFILE
syn_clear_time(&curwin->w_s->b_syn_linecont_time); syn_clear_time(&curwin->w_s->b_syn_linecont_time);
#endif #endif
@@ -6526,7 +6526,7 @@ syn_get_foldlevel(wp, lnum)
} }
#endif #endif
#ifdef FEAT_RELTIME #ifdef FEAT_PROFILE
/* /*
* ":syntime". * ":syntime".
*/ */

2
src/version.c
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 */
/**/
1130,
/**/ /**/
1129, 1129,
/**/ /**/