neovim

commit f8bdb671be2e960cb5da72db7e7aedaa17d99c0c
parent 7b99e1f0c3075a48080990c4d172bc1818a6c532
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 23 Sep 2025 06:41:16 +0800

Merge pull request #35878 from zeertzjq/vim-9.1.1781

vim-patch:9.1.{1781,1783}
Diffstat:
M
src/nvim/eval.c
 | 
2
+-
M
src/nvim/insexpand.c
 | 
24
++++++++++++------------

2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
@@ -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.
 /// 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);
 
diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c
@@ -1090,6 +1090,18 @@ static void ins_compl_insert_bytes(char *p, int len)
   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
 /// column range. If it is, it returns a special highlight attribute.
 /// -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_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
 /// dictionary files "dict_start" to the list of completions.
 ///