Merge #41350 from janlazo/vim-8.1.1880

vim-patch:8.1.1880,9.0.0885

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"));

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;
   }
 

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".