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

updated for version 7.0107

Browse Source
This commit is contained in:
Bram Moolenaar 2005-07-11 22:40:32 +00:00
parent 9ff7011bcb
commit 3b56eb3d31
15 changed files with 71 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/doc/options.txt
View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 7.0aa. Last change: 2005 Jul 08
*options.txt* For Vim version 7.0aa. Last change: 2005 Jul 11
VIM REFERENCE MANUAL by Bram Moolenaar
@ -6015,6 +6015,20 @@ A jump table for the options with a short description can be found at |Q_op|.
a buffer. Otherwise: do not split, use current window.
Supported in |quickfix| commands that display errors.
*'synmaxcol'* *'smc'*
'synmaxcol' 'smc' number (default 3000)
local to buffer
{not in Vi}
{not available when compiled without the |+syntax|
feature}
Maximum column in which to search for syntax items. With longer lines
some parts may not be highlighted and following text may not be
highlighted correctly (e.g., when the start or end of a region is not
recognized because it is beyond 'synmaxcol').
This helps to avoid very slow redrawing for an XML file that is one
long line.
Set to zero to remove the limit.
*'syntax'* *'syn'*
'syntax' 'syn' string (default empty)
local to buffer
@ -6026,7 +6040,7 @@ A jump table for the options with a short description can be found at |Q_op|.
Otherwise this option does not always reflect the current syntax (the
b:current_syntax variable does).
This option is most useful in a modeline, for a file which syntax is
not automatically recognized. Example, for in an IDL file: >
not automatically recognized. Example, in an IDL file: >
/* vim: set syntax=idl : */
< To switch off syntax highlighting for the current file, use: >
:set syntax=OFF

2
runtime/doc/tags
View File

@ -721,6 +721,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
'smartcase' options.txt /*'smartcase'*
'smartindent' options.txt /*'smartindent'*
'smarttab' options.txt /*'smarttab'*
'smc' options.txt /*'smc'*
'smd' options.txt /*'smd'*
'sn' options.txt /*'sn'*
'so' options.txt /*'so'*
@ -765,6 +766,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
'sws' options.txt /*'sws'*
'sxq' options.txt /*'sxq'*
'syn' options.txt /*'syn'*
'synmaxcol' options.txt /*'synmaxcol'*
'syntax' options.txt /*'syntax'*
't_#2' term.txt /*'t_#2'*
't_#4' term.txt /*'t_#4'*

7
runtime/doc/todo.txt
View File

@ -1,4 +1,4 @@
*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 09
*todo.txt* For Vim version 7.0aa. Last change: 2005 Jul 11
VIM REFERENCE MANUAL by Bram Moolenaar
@ -30,11 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs*
-------------------- Known bugs and current work -----------------------
9 Editing a XML file with a long line is extremely slow. Example file from
Randy Parker (Dec 13). Editing the dictionaries for engspchk plugin with
syntax highlighting is also very slow.
Limit the searching for items to a few hundred characters?
Add extra list of file locations. Can be used with:
:ltag list of matching tags, like :tselect

4
runtime/doc/version7.txt
View File

@ -1,4 +1,4 @@
*version7.txt* For Vim version 7.0aa. Last change: 2005 Jul 09
*version7.txt* For Vim version 7.0aa. Last change: 2005 Jul 11
VIM REFERENCE MANUAL by Bram Moolenaar
@ -311,6 +311,8 @@ Options: ~
'spell' switch spell checking on/off
'spelllang' languages to check spelling for
'spellsuggest' methods for spell suggestions
'synmaxcol' maximum column to look for syntax items; avoids very
slow redrawing when there are very long lines
'verbosefile' Log messages in a file.

2
src/ex_getln.c
View File

@ -4193,6 +4193,8 @@ ExpandGeneric(xp, regmatch, num_file, file, func)
}
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
static void * call_user_expand_func __ARGS((void *(*user_expand_func) __ARGS((char_u *, int, char_u **, int)), expand_T *xp, int *num_file, char_u ***file));
/*
* call "user_expand_func()" to invoke a user defined VimL function and return
* the result (either a string or a List).

1
src/globals.h
View File

@ -900,7 +900,6 @@ EXTERN int termcap_active INIT(= FALSE); /* set by starttermcap() */
EXTERN int cur_tmode INIT(= TMODE_COOK); /* input terminal mode */
EXTERN int bangredo INIT(= FALSE); /* set to TRUE whith ! command */
EXTERN int searchcmdlen; /* length of previous search cmd */
EXTERN int reg_syn INIT(= 0); /* vim_regexec() used for syntax */
#ifdef FEAT_SYN_HL
EXTERN int reg_do_extmatch INIT(= 0); /* Used when compiling regexp:
* REX_SET to allow \z\(...\),

1
src/misc1.c
View File

@ -400,6 +400,7 @@ get_number_indent(lnum)
if (regmatch.regprog != NULL)
{
regmatch.rmm_ic = FALSE;
regmatch.rmm_maxcol = 0;
if (vim_regexec_multi(&regmatch, curwin, curbuf, lnum, (colnr_T)0))
{
pos.lnum = regmatch.endpos[0].lnum + lnum;

13
src/option.c
View File

@ -129,6 +129,7 @@ typedef enum
, PV_SUA
, PV_SW
, PV_SWF
, PV_SMC
, PV_SYN
, PV_TAGS
, PV_TS
@ -235,6 +236,7 @@ static char_u *p_sua;
static long p_sw;
static int p_swf;
#ifdef FEAT_SYN_HL
static long p_smc;
static char_u *p_syn;
static char_u *p_spc;
static char_u *p_spf;
@ -2115,6 +2117,15 @@ static struct vimoption
{"switchbuf", "swb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
(char_u *)&p_swb, PV_NONE,
{(char_u *)"", (char_u *)0L}},
{"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF,
#ifdef FEAT_SYN_HL
(char_u *)&p_smc, PV_SMC,
{(char_u *)3000L, (char_u *)0L}
#else
(char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L}
#endif
},
{"syntax", "syn", P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
#ifdef FEAT_SYN_HL
(char_u *)&p_syn, PV_SYN,
@ -8445,6 +8456,7 @@ get_varp(p)
#endif
case PV_SWF: return (char_u *)&(curbuf->b_p_swf);
#ifdef FEAT_SYN_HL
case PV_SMC: return (char_u *)&(curbuf->b_p_smc);
case PV_SYN: return (char_u *)&(curbuf->b_p_syn);
case PV_SPC: return (char_u *)&(curbuf->b_p_spc);
case PV_SPF: return (char_u *)&(curbuf->b_p_spf);
@ -8761,6 +8773,7 @@ buf_copy_options(buf, flags)
#ifdef FEAT_SYN_HL
/* Don't copy 'syntax', it must be set */
buf->b_p_syn = empty_option;
buf->b_p_smc = p_smc;
buf->b_p_spc = vim_strsave(p_spc);
(void)compile_cap_prog(buf);
buf->b_p_spf = vim_strsave(p_spf);

1
src/quickfix.c
View File

@ -2399,6 +2399,7 @@ ex_vimgrep(eap)
if (regmatch.regprog == NULL)
goto theend;
regmatch.rmm_ic = p_ic;
regmatch.rmm_maxcol = 0;
p = skipwhite(p);
if (*p == NUL)

28
src/regexp.c
View File

@ -866,8 +866,8 @@ skip_anyof(p)
int l;
#endif
cpo_lit = (!reg_syn && vim_strchr(p_cpo, CPO_LITERAL) != NULL);
cpo_bsl = (!reg_syn && vim_strchr(p_cpo, CPO_BACKSL) != NULL);
cpo_lit = vim_strchr(p_cpo, CPO_LITERAL) != NULL;
cpo_bsl = vim_strchr(p_cpo, CPO_BACKSL) != NULL;
if (*p == '^') /* Complement of range. */
++p;
@ -1573,8 +1573,8 @@ regatom(flagp)
int extra = 0;
*flagp = WORST; /* Tentatively. */
cpo_lit = (!reg_syn && vim_strchr(p_cpo, CPO_LITERAL) != NULL);
cpo_bsl = (!reg_syn && vim_strchr(p_cpo, CPO_BACKSL) != NULL);
cpo_lit = vim_strchr(p_cpo, CPO_LITERAL) != NULL;
cpo_bsl = vim_strchr(p_cpo, CPO_BACKSL) != NULL;
c = getchr();
switch (c)
@ -3043,6 +3043,12 @@ static int ireg_ic;
static int ireg_icombine;
#endif
/*
* Copy of "rmm_maxcol": maximum column to search for a match. Zero when
* there is no maximum.
*/
static int ireg_maxcol;
/*
* Sometimes need to save a copy of a line. Since alloc()/free() is very
* slow, we keep one allocated piece of memory and only re-allocate it when
@ -3203,6 +3209,7 @@ vim_regexec(rmp, line, col)
#ifdef FEAT_MBYTE
ireg_icombine = FALSE;
#endif
ireg_maxcol = 0;
return (vim_regexec_both(line, col) != 0);
}
@ -3226,6 +3233,7 @@ vim_regexec_nl(rmp, line, col)
#ifdef FEAT_MBYTE
ireg_icombine = FALSE;
#endif
ireg_maxcol = 0;
return (vim_regexec_both(line, col) != 0);
}
#endif
@ -3260,6 +3268,7 @@ vim_regexec_multi(rmp, win, buf, lnum, col)
#ifdef FEAT_MBYTE
ireg_icombine = FALSE;
#endif
ireg_maxcol = rmp->rmm_maxcol;
/* Need to switch to buffer "buf" to make vim_iswordc() work. */
curbuf = buf;
@ -3317,6 +3326,10 @@ vim_regexec_both(line, col)
if (prog_magic_wrong())
goto theend;
/* If the start column is past the maximum column: no need to try. */
if (ireg_maxcol > 0 && col >= ireg_maxcol)
goto theend;
/* If pattern contains "\c" or "\C": overrule value of ireg_ic */
if (prog->regflags & RF_ICASE)
ireg_ic = TRUE;
@ -3428,6 +3441,13 @@ vim_regexec_both(line, col)
col = (int)(s - regline);
}
/* Check for maximum column to try. */
if (ireg_maxcol > 0 && col >= ireg_maxcol)
{
retval = 0;
break;
}
retval = regtry(prog, col);
if (retval > 0)
break;

1
src/regexp.h
View File

@ -64,6 +64,7 @@ typedef struct
lpos_T startpos[NSUBEXP];
lpos_T endpos[NSUBEXP];
int rmm_ic;
int rmm_maxcol; /* when not zero: maximum column */
} regmmatch_T;
/*

1
src/search.c
View File

@ -215,6 +215,7 @@ search_regcomp(pat, pat_save, pat_use, options, regmatch)
}
regmatch->rmm_ic = ignorecase(pat);
regmatch->rmm_maxcol = 0;
regmatch->regprog = vim_regcomp(pat, magic ? RE_MAGIC : 0);
if (regmatch->regprog == NULL)
return FAIL;

1
src/structs.h
View File

@ -1344,6 +1344,7 @@ struct file_buffer
#endif
int b_p_swf; /* 'swapfile' */
#ifdef FEAT_SYN_HL
long b_p_smc; /* 'synmaxcol' */
char_u *b_p_syn; /* 'syntax' */
char_u *b_p_spc; /* 'spellcapcheck' */
regprog_T *b_cap_prog; /* program for 'spellcapcheck' */

17
src/syntax.c
View File

@ -463,8 +463,6 @@ syntax_start(wp, lnum)
int dist;
static int changedtick = 0; /* remember the last change ID */
reg_syn = TRUE; /* let vim_regexec() know we're using syntax */
/*
* After switching buffers, invalidate current_state.
* Also do this when a change was made, the current state may be invalid
@ -483,7 +481,7 @@ syntax_start(wp, lnum)
*/
syn_stack_alloc();
if (syn_buf->b_sst_array == NULL)
goto theend; /* out of memory */
return; /* out of memory */
syn_buf->b_sst_lasttick = display_tick;
/*
@ -607,9 +605,6 @@ syntax_start(wp, lnum)
}
syn_start_line();
theend:
reg_syn = FALSE;
}
/*
@ -1604,8 +1599,6 @@ syntax_check_changed(lnum)
int retval = TRUE;
synstate_T *sp;
reg_syn = TRUE; /* let vim_regexec() know we're using syntax */
/*
* Check the state stack when:
* - lnum is just below the previously syntaxed line.
@ -1639,8 +1632,6 @@ syntax_check_changed(lnum)
}
}
reg_syn = FALSE;
return retval;
}
@ -1707,8 +1698,6 @@ get_syntax_attr(col, can_spell)
if (syn_buf->b_sst_array == NULL)
return 0;
reg_syn = TRUE; /* let vim_regexec() know we're using syntax */
/* Make sure current_state is valid */
if (INVALID_STATE(&current_state))
validate_current_state();
@ -1722,7 +1711,6 @@ get_syntax_attr(col, can_spell)
++current_col;
}
reg_syn = FALSE;
return attr;
}
@ -2999,7 +2987,7 @@ syn_getcurline()
}
/*
* Call vim_regexec() to match in syn_buf.
* Call vim_regexec() to find a match with "rmp" in "syn_buf".
* Returns TRUE when there is a match.
*/
static int
@ -3008,6 +2996,7 @@ syn_regexec(rmp, lnum, col)
linenr_T lnum;
colnr_T col;
{
rmp->rmm_maxcol = syn_buf->b_p_smc;
if (vim_regexec_multi(rmp, syn_win, syn_buf, lnum, col) > 0)
{
rmp->startpos[0].lnum += lnum;

4
src/version.h
View File

@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 9)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 9, compiled "
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 11)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 11, compiled "