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

updated for version 7.0229

Browse Source
This commit is contained in:
Bram Moolenaar 2006-03-19 22:15:26 +00:00
parent c15ef30c08
commit 39f05630ad
7 changed files with 105 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/doc/eval.txt
View File

@ -1,4 +1,4 @@
*eval.txt* For Vim version 7.0aa. Last change: 2006 Mar 18
*eval.txt* For Vim version 7.0aa. Last change: 2006 Mar 19
VIM REFERENCE MANUAL by Bram Moolenaar
@ -2011,6 +2011,8 @@ complete_add({expr}) *complete_add()*
Returns 0 for failure (empty string or out of memory),
1 when the match was added, 2 when the match was already in
the list.
See |complete-functions| for an explanation of {expr}. It is
the same as one item in the list that 'omnifunc' would return.
complete_check() *complete_check()*
Check for a key typed while looking for completion matches.
@ -2910,7 +2912,8 @@ hasmapto({what} [, {mode} [, {abbr}]]) *hasmapto()*
and this mapping exists in one of the modes indicated by
{mode}.
When {abbr} is there and it is non-zero use abbreviations
instead of mappings.
instead of mappings. Don't forget to specify Insert and/or
Command-line mode.
Both the global mappings and the mappings local to the current
buffer are checked for a match.
If no matching mapping is found 0 is returned.
@ -5315,7 +5318,7 @@ with local variables in a calling function. Example: >
The names "lnum" and "col" could also be passed as argument to Bar(), to allow
the caller to set the names.
*:cal* *:call* *E107*
*:cal* *:call* *E107* *E117*
:[range]cal[l] {name}([arguments])
Call a function. The name of the function and its arguments
are as specified with |:function|. Up to 20 arguments can be

2
runtime/doc/tags
View File

@ -3224,6 +3224,7 @@ E113 eval.txt /*E113*
E114 eval.txt /*E114*
E115 eval.txt /*E115*
E116 eval.txt /*E116*
E117 eval.txt /*E117*
E118 eval.txt /*E118*
E119 eval.txt /*E119*
E12 message.txt /*E12*
@ -5528,6 +5529,7 @@ hebrew hebrew.txt /*hebrew*
hebrew.txt hebrew.txt /*hebrew.txt*
help various.txt /*help*
help-context help.txt /*help-context*
help-tags tags 1
help-translated various.txt /*help-translated*
help-xterm-window various.txt /*help-xterm-window*
help.txt help.txt /*help.txt*

151
src/edit.c
View File

@ -69,9 +69,7 @@ struct compl_S
compl_T *cp_prev;
char_u *cp_str; /* matched text */
char cp_icase; /* TRUE or FALSE: ignore case */
char_u *cp_kind; /* kind menu text (allocated, can be NULL) */
char_u *cp_extra; /* extra menu text (allocated, can be NULL) */
char_u *cp_info; /* verbose info (can be NULL) */
char_u *(cp_text[CPT_COUNT]); /* text for the menu */
char_u *cp_fname; /* file containing the match, allocated when
* cp_flags has FREE_FNAME */
int cp_flags; /* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
@ -2060,10 +2058,9 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags)
/* Copy the original case of the part we typed */
STRNCPY(IObuff, compl_orig_text, compl_length);
return ins_compl_add(IObuff, len, icase, fname, NULL, NULL, NULL,
dir, flags);
return ins_compl_add(IObuff, len, icase, fname, NULL, dir, flags);
}
return ins_compl_add(str, len, icase, fname, NULL, NULL, NULL, dir, flags);
return ins_compl_add(str, len, icase, fname, NULL, dir, flags);
}
/*
@ -2073,14 +2070,12 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags)
* maybe because alloc() returns NULL, then FAIL is returned.
*/
int
ins_compl_add(str, len, icase, fname, kind, extra, info, cdir, flags)
ins_compl_add(str, len, icase, fname, cptext, cdir, flags)
char_u *str;
int len;
int icase;
char_u *fname;
char_u *kind; /* extra text for popup menu or NULL */
char_u *extra; /* extra text for popup menu or NULL */
char_u *info; /* extra text for popup menu or NULL */
char_u **cptext; /* extra text for popup menu or NULL */
int cdir;
int flags;
{
@ -2146,12 +2141,15 @@ ins_compl_add(str, len, icase, fname, kind, extra, info, cdir, flags)
else
match->cp_fname = NULL;
match->cp_flags = flags;
if (kind != NULL && *kind != NUL)
match->cp_kind = vim_strsave(kind);
if (extra != NULL && *extra != NUL)
match->cp_extra = vim_strsave(extra);
if (info != NULL && *info != NUL)
match->cp_info = vim_strsave(info);
if (cptext != NULL)
{
int i;
for (i = 0; i < CPT_COUNT; ++i)
if (cptext[i] != NULL && *cptext[i] != NUL)
match->cp_text[i] = vim_strsave(cptext[i]);
}
/*
* Link the new match structure in the list of matches.
@ -2285,7 +2283,7 @@ ins_compl_add_matches(num_matches, matches, icase)
for (i = 0; i < num_matches && add_r != FAIL; i++)
if ((add_r = ins_compl_add(matches[i], -1, icase,
NULL, NULL, NULL, NULL, dir, 0)) == OK)
NULL, NULL, dir, 0)) == OK)
/* if dir was BACKWARD then honor it just once */
dir = FORWARD;
FreeWild(num_matches, matches);
@ -2343,7 +2341,7 @@ set_completion(startcol, list)
/* compl_pattern doesn't need to be set */
compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length);
if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
-1, FALSE, NULL, NULL, NULL, NULL, 0, ORIGINAL_TEXT) != OK)
-1, FALSE, NULL, NULL, 0, ORIGINAL_TEXT) != OK)
return;
/* Handle like dictionary completion. */
@ -2511,13 +2509,17 @@ ins_compl_show_pum()
shown_compl = compl;
cur = i;
}
compl_match_array[i].pum_text = compl->cp_str;
if (compl->cp_kind != NULL)
compl_match_array[i].pum_kind = compl->cp_kind;
if (compl->cp_info != NULL)
compl_match_array[i].pum_info = compl->cp_info;
if (compl->cp_extra != NULL)
compl_match_array[i++].pum_extra = compl->cp_extra;
if (compl->cp_text[CPT_ABBR] != NULL)
compl_match_array[i].pum_text =
compl->cp_text[CPT_ABBR];
else
compl_match_array[i].pum_text = compl->cp_str;
compl_match_array[i].pum_kind = compl->cp_text[CPT_KIND];
compl_match_array[i].pum_info = compl->cp_text[CPT_INFO];
if (compl->cp_text[CPT_MENU] != NULL)
compl_match_array[i++].pum_extra =
compl->cp_text[CPT_MENU];
else
compl_match_array[i++].pum_extra = compl->cp_fname;
}
@ -2550,7 +2552,9 @@ ins_compl_show_pum()
{
/* popup menu already exists, only need to find the current item.*/
for (i = 0; i < compl_match_arraysize; ++i)
if (compl_match_array[i].pum_text == compl_shown_match->cp_str)
if (compl_match_array[i].pum_text == compl_shown_match->cp_str
|| compl_match_array[i].pum_text
== compl_shown_match->cp_text[CPT_ABBR])
break;
cur = i;
}
@ -2859,6 +2863,7 @@ find_line_end(ptr)
ins_compl_free()
{
compl_T *match;
int i;
vim_free(compl_pattern);
compl_pattern = NULL;
@ -2880,9 +2885,8 @@ ins_compl_free()
/* several entries may use the same fname, free it just once. */
if (match->cp_flags & FREE_FNAME)
vim_free(match->cp_fname);
vim_free(match->cp_kind);
vim_free(match->cp_extra);
vim_free(match->cp_info);
for (i = 0; i < CPT_COUNT; ++i)
vim_free(match->cp_text[i]);
vim_free(match);
} while (compl_curr_match != NULL && compl_curr_match != compl_first_match);
compl_first_match = compl_curr_match = NULL;
@ -3377,56 +3381,66 @@ expand_by_function(type, base)
}
#endif /* FEAT_COMPL_FUNC */
#if defined(FEAT_COMPL_FUNC) || defined(FEAT_EVAL)
#if defined(FEAT_COMPL_FUNC) || defined(FEAT_EVAL) || defined(PROTO)
/*
* Add completions from a list.
* Unreferences the list.
*/
static void
ins_compl_add_list(list)
list_T *list;
{
listitem_T *li;
int icase;
char_u *p;
char_u *x;
char_u *k;
char_u *info;
int dir = compl_direction;
/* Go through the List with matches and add each of them. */
for (li = list->lv_first; li != NULL; li = li->li_next)
{
icase = p_ic;
if (li->li_tv.v_type == VAR_DICT && li->li_tv.vval.v_dict != NULL)
{
p = get_dict_string(li->li_tv.vval.v_dict, (char_u *)"word", FALSE);
x = get_dict_string(li->li_tv.vval.v_dict, (char_u *)"menu", FALSE);
k = get_dict_string(li->li_tv.vval.v_dict, (char_u *)"kind", FALSE);
info = get_dict_string(li->li_tv.vval.v_dict,
(char_u *)"info", FALSE);
if (get_dict_string(li->li_tv.vval.v_dict,
(char_u *)"icase", FALSE) != NULL)
icase = get_dict_number(li->li_tv.vval.v_dict,
(char_u *)"icase");
}
else
{
p = get_tv_string_chk(&li->li_tv);
x = NULL;
k = NULL;
info = NULL;
}
if (p != NULL && *p != NUL)
{
if (ins_compl_add(p, -1, icase, NULL, k, x, info, dir, 0) == OK)
/* if dir was BACKWARD then honor it just once */
dir = FORWARD;
}
if (ins_compl_add_tv(&li->li_tv, dir) == OK)
/* if dir was BACKWARD then honor it just once */
dir = FORWARD;
else if (did_emsg)
break;
}
}
/*
* Add a match to the list of matches from a typeval_T.
* If the given string is already in the list of completions, then return
* NOTDONE, otherwise add it to the list and return OK. If there is an error,
* maybe because alloc() returns NULL, then FAIL is returned.
*/
int
ins_compl_add_tv(tv, dir)
typval_T *tv;
int dir;
{
char_u *word;
int icase = p_ic;
char_u *(cptext[CPT_COUNT]);
if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
{
word = get_dict_string(tv->vval.v_dict, (char_u *)"word", FALSE);
cptext[CPT_ABBR] = get_dict_string(tv->vval.v_dict,
(char_u *)"abbr", FALSE);
cptext[CPT_MENU] = get_dict_string(tv->vval.v_dict,
(char_u *)"menu", FALSE);
cptext[CPT_KIND] = get_dict_string(tv->vval.v_dict,
(char_u *)"kind", FALSE);
cptext[CPT_INFO] = get_dict_string(tv->vval.v_dict,
(char_u *)"info", FALSE);
if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL)
icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
}
else
{
word = get_tv_string_chk(tv);
vim_memset(cptext, 0, sizeof(cptext));
}
if (word == NULL || *word == NUL)
return FAIL;
return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0);
}
#endif
/*
@ -4509,7 +4523,7 @@ ins_complete(c)
vim_free(compl_orig_text);
compl_orig_text = vim_strnsave(line + compl_col, compl_length);
if (compl_orig_text == NULL || ins_compl_add(compl_orig_text,
-1, FALSE, NULL, NULL, NULL, NULL, 0, ORIGINAL_TEXT) != OK)
-1, FALSE, NULL, NULL, 0, ORIGINAL_TEXT) != OK)
{
vim_free(compl_pattern);
compl_pattern = NULL;
@ -5887,10 +5901,15 @@ stop_insert(end_insert_pos, esc)
pos_T tpos = curwin->w_cursor;
curwin->w_cursor = *end_insert_pos;
if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
--curwin->w_cursor.col;
while (cc = gchar_cursor(), vim_iswhite(cc))
for (;;)
{
if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
--curwin->w_cursor.col;
cc = gchar_cursor();
if (!vim_iswhite(cc))
break;
(void)del_char(TRUE);
}
if (curwin->w_cursor.lnum != tpos.lnum)
curwin->w_cursor = tpos;
else if (cc != NUL)

2
src/gui_w32.c
View File

@ -1813,7 +1813,7 @@ im_get_status()
#ifdef FEAT_MBYTE
/*
* Convert latin9 text to ucs-2.
* Convert latin9 text "text[len]" to ucs-2 in "unicodebuf".
*/
static void
latin9_to_ucs(char_u *text, int len, WCHAR *unicodebuf)

2
src/option.c
View File

@ -580,7 +580,7 @@ static struct vimoption
(char_u *)&p_beval, PV_NONE,
{(char_u *)FALSE, (char_u *)0L}},
# ifdef FEAT_EVAL
{"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
{"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
(char_u *)&p_bexpr, PV_NONE,
{(char_u *)"", (char_u *)0L}},
# endif

8
src/structs.h
View File

@ -2283,3 +2283,11 @@ typedef struct
void *tn_search_ctx;
} tagname_T;
/*
* Array indexes used for cptext argument of ins_compl_add().
*/
#define CPT_ABBR 0 /* "abbr" */
#define CPT_MENU 1 /* "menu" */
#define CPT_KIND 2 /* "kind" */
#define CPT_INFO 3 /* "info" */
#define CPT_COUNT 4 /* Number of entries */

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 (2006 Mar 18)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 18, compiled "
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 19)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Mar 19, compiled "