mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 14:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35878 from zeertzjq/vim-9.1.1781

Browse Source 
vim-patch:9.1.{1781,1783}
This commit is contained in:
zeertzjq
2025-09-23 06:41:16 +08:00
committed by GitHub
parent 7b99e1f0c3 7cdf3bb68a
commit f8bdb671be
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@@ -2632,7 +2632,7 @@ static int may_call_simple_func(const char *arg, typval_T *rettv)
/// 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 eval0_simple_funccal(char *arg, typval_T *rettv, exarg_T *eap, evalarg_T *const evalarg) static int eval0_simple_funccal(char *arg, typval_T *rettv, exarg_T *eap, evalarg_T *const evalarg)
{ {
int r = may_call_simple_func(arg, rettv); int r = may_call_simple_func(arg, rettv);

24
src/nvim/insexpand.c
View File

@@ -1090,6 +1090,18 @@ static void ins_compl_insert_bytes(char *p, int len)
compl_ins_end_col = curwin->w_cursor.col; compl_ins_end_col = curwin->w_cursor.col;
} }
/// Get current completion leader
char *ins_compl_leader(void)
{
return compl_leader.data != NULL ? compl_leader.data : compl_orig_text.data;
}
/// Get current completion leader length
static size_t ins_compl_leader_len(void)
{
return compl_leader.data != NULL ? compl_leader.size : compl_orig_text.size;
}
/// Checks if the column is within the currently inserted completion text /// Checks if the column is within the currently inserted completion text
/// column range. If it is, it returns a special highlight attribute. /// column range. If it is, it returns a special highlight attribute.
/// -1 means normal item. /// -1 means normal item.
@@ -1734,18 +1746,6 @@ bool compl_match_curr_select(int selected)
#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 *ins_compl_leader(void)
{
return compl_leader.data != NULL ? compl_leader.data : compl_orig_text.data;
}
/// Get current completion leader length
size_t ins_compl_leader_len(void)
{
return compl_leader.data != NULL ? compl_leader.size : compl_orig_text.size;
}
/// 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.
/// ///