mirror of
https://github.com/vim/vim.git
synced 2025-07-24 10:45:12 -04:00
updated for version 7.0108
This commit is contained in:
parent
5eba4c2daf
commit
1f28b07867
@ -929,7 +929,7 @@ deathtrap SIGDEFARG(sigarg)
|
|||||||
|| sigarg == SIGUSR2
|
|| sigarg == SIGUSR2
|
||||||
# endif
|
# endif
|
||||||
)
|
)
|
||||||
&& !handle_signal(sigarg))
|
&& !vim_handle_signal(sigarg))
|
||||||
SIGRETURN;
|
SIGRETURN;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -1223,7 +1223,7 @@ catch_signals(func_deadly, func_other)
|
|||||||
* Returns TRUE when Vim should exit.
|
* Returns TRUE when Vim should exit.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
handle_signal(sig)
|
vim_handle_signal(sig)
|
||||||
int sig;
|
int sig;
|
||||||
{
|
{
|
||||||
static int got_signal = 0;
|
static int got_signal = 0;
|
||||||
|
26
src/tag.c
26
src/tag.c
@ -1273,18 +1273,19 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
|
|||||||
vim_memset(&search_info, 0, (size_t)1);
|
vim_memset(&search_info, 0, (size_t)1);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* When finding a specified number of matches, first try with matching case,
|
* When finding a specified number of matches, first try with matching
|
||||||
* so binary search can be used, and try ignore-case matches in a second loop.
|
* case, so binary search can be used, and try ignore-case matches in a
|
||||||
* When finding all matches, 'tagbsearch' is off, or there is no fixed string
|
* second loop.
|
||||||
* to look for, ignore case right away to avoid going though the tags files
|
* When finding all matches, 'tagbsearch' is off, or there is no fixed
|
||||||
* twice.
|
* string to look for, ignore case right away to avoid going though the
|
||||||
* When the tag file is case-fold sorted, it is either one or the other.
|
* tags files twice.
|
||||||
* Only ignore case when TAG_NOIC not used or 'ignorecase' set.
|
* When the tag file is case-fold sorted, it is either one or the other.
|
||||||
*/
|
* Only ignore case when TAG_NOIC not used or 'ignorecase' set.
|
||||||
|
*/
|
||||||
#ifdef FEAT_TAG_BINS
|
#ifdef FEAT_TAG_BINS
|
||||||
pats->regmatch.rm_ic = ((p_ic || !noic)
|
pats->regmatch.rm_ic = ((p_ic || !noic)
|
||||||
&& (findall || pats->headlen == 0 || !p_tbs));
|
&& (findall || pats->headlen == 0 || !p_tbs));
|
||||||
for (round = 1; round <= 2; ++round)
|
for (round = 1; round <= 2; ++round)
|
||||||
{
|
{
|
||||||
linear = (pats->headlen == 0 || !p_tbs || round == 2);
|
linear = (pats->headlen == 0 || !p_tbs || round == 2);
|
||||||
@ -2270,9 +2271,8 @@ line_read_in:
|
|||||||
} /* end of for-each-file loop */
|
} /* end of for-each-file loop */
|
||||||
|
|
||||||
#ifdef FEAT_TAG_BINS
|
#ifdef FEAT_TAG_BINS
|
||||||
/* stop searching when already did a linear search, or when
|
/* stop searching when already did a linear search, or when TAG_NOIC
|
||||||
* TAG_NOIC used, and 'ignorecase' not set
|
* used, and 'ignorecase' not set or already did case-ignore search */
|
||||||
* or already did case-ignore search */
|
|
||||||
if (stop_searching || linear || (!p_ic && noic) || pats->regmatch.rm_ic)
|
if (stop_searching || linear || (!p_ic && noic) || pats->regmatch.rm_ic)
|
||||||
break;
|
break;
|
||||||
# ifdef FEAT_CSCOPE
|
# ifdef FEAT_CSCOPE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user