diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-04 21:55:31 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-04 21:55:31 +0000 |
| commit | 87b5ca5172eb9e61f72f54f598d6d2ad646a8a76 (patch) | |
| tree | 3d83af536ded8a5be657f757be1324595f672780 /src | |
| parent | 36fc535cb1353786d7edacfea1cd3ececaf6cf5d (diff) | |
| download | vim-git-87b5ca5172eb9e61f72f54f598d6d2ad646a8a76.tar.gz | |
updated for version 7.0214
Diffstat (limited to 'src')
| -rw-r--r-- | src/edit.c | 3 | ||||
| -rw-r--r-- | src/proto/spell.pro | 2 | ||||
| -rw-r--r-- | src/quickfix.c | 2 | ||||
| -rw-r--r-- | src/search.c | 9 | ||||
| -rw-r--r-- | src/version.h | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/src/edit.c b/src/edit.c index 5809df1bb..3ad12a7a6 100644 --- a/src/edit.c +++ b/src/edit.c @@ -2596,7 +2596,8 @@ ins_compl_dictionaries(dict_start, pat, flags, thesaurus) if (count == -1) { - /* Skip "\<" in the pattern, we don't use it as a RE. */ + /* Complete from active spelling. Skip "\<" in the pattern, we + * don't use it as a RE. */ if (pat[0] == '\\' && pat[1] == '<') ptr = pat + 2; else diff --git a/src/proto/spell.pro b/src/proto/spell.pro index 16eb19d32..9fc7a7433 100644 --- a/src/proto/spell.pro +++ b/src/proto/spell.pro @@ -9,7 +9,7 @@ int spell_check_msm __ARGS((void)); void put_bytes __ARGS((FILE *fd, long_u nr, int len)); void ex_mkspell __ARGS((exarg_T *eap)); void ex_spell __ARGS((exarg_T *eap)); -void spell_add_word __ARGS((char_u *word, int len, int bad, int index)); +void spell_add_word __ARGS((char_u *word, int len, int bad, int index, int undo)); void init_spell_chartab __ARGS((void)); int spell_check_sps __ARGS((void)); void spell_suggest __ARGS((int count)); diff --git a/src/quickfix.c b/src/quickfix.c index 2d83f1fcf..bc4ef1c6a 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -3339,7 +3339,7 @@ get_errorlist(wp, list) } if (qi->qf_curlist >= qi->qf_listcount - || qi->qf_lists[qi->qf_curlist].qf_count == 0) + || qi->qf_lists[qi->qf_curlist].qf_count == 0) return FAIL; qfp = qi->qf_lists[qi->qf_curlist].qf_start; diff --git a/src/search.c b/src/search.c index 163605c55..12751f811 100644 --- a/src/search.c +++ b/src/search.c @@ -4686,7 +4686,16 @@ find_pattern_in_path(ptr, dir, len, whole, skip_comments, (char *)new_fname); msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); } + else #endif + if (p_verbose >= 5) + { + verbose_enter(); + smsg((char_u *)_("Searching included file %s"), + (char *)new_fname); + verbose_leave(); + } + } } } diff --git a/src/version.h b/src/version.h index 5703a0601..5c288aada 100644 --- a/src/version.h +++ b/src/version.h @@ -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 (2006 Mar 3)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 3, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 4)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 4, compiled " |