1 files changed, 12 insertions, 10 deletions

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 9705896e9b..6316129c6a 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -1270,8 +1270,9 @@ static regprog_T *bt_regcomp(char_u *expr, int re_flags)
   int len;
   int flags;
 
-  if (expr == NULL)
-    EMSG_RET_NULL(_(e_null));
+  if (expr == NULL) {
+    IEMSG_RET_NULL(_(e_null));
+  }
 
   init_class_tab();
 
@@ -3483,7 +3484,7 @@ static long bt_regexec_both(char_u *line,
 
   /* Be paranoid... */
   if (prog == NULL || line == NULL) {
-    EMSG(_(e_null));
+    IEMSG(_(e_null));
     goto theend;
   }
 
@@ -4789,7 +4790,7 @@ static bool regmatch(
           break;
 
         default:
-          EMSG(_(e_re_corr));
+          IEMSG(_(e_re_corr));
 #ifdef REGEXP_DEBUG
           printf("Illegal op code %d\n", op);
 #endif
@@ -5147,7 +5148,7 @@ static bool regmatch(
          * We get here only if there's trouble -- normally "case END" is
          * the terminating point.
          */
-        EMSG(_(e_re_corr));
+        IEMSG(_(e_re_corr));
 #ifdef REGEXP_DEBUG
         printf("Premature EOL\n");
 #endif
@@ -5552,8 +5553,8 @@ do_class:
     }
     break;
 
-  default:                      /* Oh dear.  Called inappropriately. */
-    EMSG(_(e_re_corr));
+  default:  // Oh dear.  Called inappropriately.
+    IEMSG(_(e_re_corr));
 #ifdef REGEXP_DEBUG
     printf("Called regrepeat with op code %d\n", OP(p));
 #endif
@@ -6707,14 +6708,14 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
         argv[0].vval.v_list = &matchList.sl_list;
         if (expr->v_type == VAR_FUNC) {
           s = expr->vval.v_string;
-          call_func(s, (int)STRLEN(s), &rettv, 1, argv,
+          call_func(s, -1, &rettv, 1, argv,
                     fill_submatch_list, 0L, 0L, &dummy,
                     true, NULL, NULL);
         } else if (expr->v_type == VAR_PARTIAL) {
           partial_T *partial = expr->vval.v_partial;
 
           s = partial_name(partial);
-          call_func(s, (int)STRLEN(s), &rettv, 1, argv,
+          call_func(s, -1, &rettv, 1, argv,
                     fill_submatch_list, 0L, 0L, &dummy,
                     true, partial, NULL);
         }
@@ -6911,7 +6912,7 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest,
               }
             } else if (*s == NUL) {  // we hit NUL.
               if (copy) {
-                EMSG(_(e_re_damg));
+                IEMSG(_(e_re_damg));
               }
               goto exit;
             } else {
@@ -7386,6 +7387,7 @@ long vim_regexec_multi(
     proftime_T  *tm,                // timeout limit or NULL
     int         *timed_out          // flag is set when timeout limit reached
 )
+  FUNC_ATTR_NONNULL_ARG(1)
 {
   regexec_T rex_save;
   bool rex_in_use_save = rex_in_use;