patch 9.1.1783: ins_compl_leader() too far away from ins_compl_leader_len()
Problem: ins_compl_leader() defined too far away from
ins_compl_leader_len() (after 9.1.1781).
Solution: Move ins_compl_leader() just before ins_compl_leader_len().
Add missing "static" to eval0_simple_funccal() definition.
(zeertzjq).
closes: #18364
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
e87d17ecfb
commit
94c128184f
@ -3439,7 +3439,7 @@ may_call_simple_func(
|
|||||||
* Handle zero level expression with optimization for a simple function call.
|
* Handle zero level expression with optimization for a simple function call.
|
||||||
* Same arguments and return value as eval0().
|
* Same arguments and return value as eval0().
|
||||||
*/
|
*/
|
||||||
int
|
static int
|
||||||
eval0_simple_funccal(
|
eval0_simple_funccal(
|
||||||
char_u *arg,
|
char_u *arg,
|
||||||
typval_T *rettv,
|
typval_T *rettv,
|
||||||
|
|||||||
@ -1057,6 +1057,15 @@ ins_compl_insert_bytes(char_u *p, int len)
|
|||||||
compl_ins_end_col = curwin->w_cursor.col;
|
compl_ins_end_col = curwin->w_cursor.col;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get current completion leader
|
||||||
|
*/
|
||||||
|
char_u *
|
||||||
|
ins_compl_leader(void)
|
||||||
|
{
|
||||||
|
return compl_leader.string != NULL ? compl_leader.string : compl_orig_text.string;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get current completion leader length
|
* Get current completion leader length
|
||||||
*/
|
*/
|
||||||
@ -1836,15 +1845,6 @@ ins_compl_show_pum(void)
|
|||||||
#define DICT_FIRST (1) // use just first element in "dict"
|
#define DICT_FIRST (1) // use just first element in "dict"
|
||||||
#define DICT_EXACT (2) // "dict" is the exact name of a file
|
#define DICT_EXACT (2) // "dict" is the exact name of a file
|
||||||
|
|
||||||
/*
|
|
||||||
* Get current completion leader
|
|
||||||
*/
|
|
||||||
char_u *
|
|
||||||
ins_compl_leader(void)
|
|
||||||
{
|
|
||||||
return compl_leader.string != NULL ? compl_leader.string : compl_orig_text.string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add any identifiers that match the given pattern "pat" in the list of
|
* Add any identifiers that match the given pattern "pat" in the list of
|
||||||
* dictionary files "dict_start" to the list of completions.
|
* dictionary files "dict_start" to the list of completions.
|
||||||
|
|||||||
@ -724,6 +724,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 */
|
||||||
|
/**/
|
||||||
|
1783,
|
||||||
/**/
|
/**/
|
||||||
1782,
|
1782,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user