From 976d05b083fa8bdcf4fcea68f897201b4eecee01 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 15 Aug 2026 07:42:04 -0400 Subject: [PATCH 1/2] vim-patch:8.1.1880: cannot show extra info for completion in a popup window Problem: Cannot show extra info for completion in a popup window. Solution: Add the "popup" entry in 'completeopt'. https://github.com/vim/vim/commit/576a4a6ff14da876d7c4418e5f27e926fcfa8d2a Co-authored-by: Bram Moolenaar --- src/nvim/popupmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/popupmenu.c b/src/nvim/popupmenu.c index 8ae0b4f0ce..9702c5a814 100644 --- a/src/nvim/popupmenu.c +++ b/src/nvim/popupmenu.c @@ -1128,7 +1128,7 @@ static bool pum_set_selected(int n, int repeat) pum_first = MIN(pum_first, pum_size - pum_height); // Show extra info in the preview window if there is something and - // 'completeopt' contains "preview". + // 'completeopt' contains "preview" or "popup". // Skip this when tried twice already. // Skip this also when there is not much room. // Skip this for command-window when 'completeopt' contains "preview". From a7ca7ed318413ae3e4a5d9d791a591982bd5cf8f Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 17 Aug 2026 02:17:13 -0400 Subject: [PATCH 2/2] vim-patch:9.0.0885: informational message has an error message number Problem: Informational message has an error message number. Solution: Use a message without an error number. (closes vim/vim#11530) https://github.com/vim/vim/commit/b53a190e9f8a767bbd4be2f538649a09f9c8ba4b Co-authored-by: Bram Moolenaar --- src/nvim/errors.h | 1 - src/nvim/insexpand.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nvim/errors.h b/src/nvim/errors.h index 48d02ebc61..6cada1d15e 100644 --- a/src/nvim/errors.h +++ b/src/nvim/errors.h @@ -81,7 +81,6 @@ EXTERN const char e_null[] INIT(= N_("E38: Null argument")); EXTERN const char e_number_exp[] INIT(= N_("E39: Number expected")); EXTERN const char e_openerrf[] INIT(= N_("E40: Can't open errorfile %s")); EXTERN const char e_outofmem[] INIT(= N_("E41: Out of memory!")); -EXTERN const char e_patnotf[] INIT(= N_("Pattern not found")); EXTERN const char e_patnotf2[] INIT(= N_("E486: Pattern not found: %s")); EXTERN const char e_positive[] INIT(= N_("E487: Argument must be positive")); EXTERN const char e_prev_dir[] INIT(= N_("E459: Cannot go back to previous directory")); diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index 0a27ccb457..642e995098 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -211,7 +211,6 @@ typedef enum { CP_FAST = 32, ///< use fast_breakcheck instead of os_breakcheck } cp_flags_T; -static const char e_hitend[] = N_("Hit end of paragraph"); static const char e_compldel[] = N_("E840: Completion function deleted text"); // All the current matches are stored in a list. @@ -6213,7 +6212,8 @@ static void ins_compl_show_statusmsg(void) { // we found no match if the list has only the "compl_orig_text"-entry if (is_first_match(compl_first_match->cp_next)) { - edit_submode_extra = compl_status_adding() && compl_length > 1 ? _(e_hitend) : _(e_patnotf); + edit_submode_extra = compl_status_adding() && compl_length > 1 + ? _("Hit end of paragraph") : _("Pattern not found"); edit_submode_highl = HLF_E; }