patch 9.1.1783: ins_compl_leader() too far away from ins_compl_leader_len()
Commit: https://github.com/vim/vim/commit/94c128184f926e6330973e5979fde320f04102f5 Author: zeertzjq <[email protected]> Date: Mon Sep 22 18:22:27 2025 +0000 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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]> diff --git a/src/eval.c b/src/eval.c index 9895f1069..503623491 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3439,7 +3439,7 @@ may_call_simple_func( * Handle zero level expression with optimization for a simple function call. * Same arguments and return value as eval0(). */ - int + static int eval0_simple_funccal( char_u *arg, typval_T *rettv, diff --git a/src/insexpand.c b/src/insexpand.c index cd366febb..65e7a95eb 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -1057,6 +1057,15 @@ ins_compl_insert_bytes(char_u *p, int len) 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 */ @@ -1836,15 +1845,6 @@ ins_compl_show_pum(void) #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_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 * dictionary files "dict_start" to the list of completions. diff --git a/src/version.c b/src/version.c index 74dcf0e4f..efea7d85f 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1783, /**/ 1782, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1v0lIc-0055y5-Ra%40256bit.org.
