1 files changed, 10 insertions, 10 deletions

diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 11c1aa1760..47cbf01996 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -283,7 +283,7 @@ char_u *vim_strsave_shellescape(const char_u *string, bool do_special, bool do_n
       continue;
     }
 
-    MB_COPY_CHAR(p, d);
+    mb_copy_char(&p, &d);
   }
 
   // add terminating quote and finish with a NUL
@@ -557,7 +557,7 @@ static varnumber_T tv_nr(typval_T *tvs, int *idxp)
   varnumber_T n = 0;
 
   if (tvs[idx].v_type == VAR_UNKNOWN) {
-    EMSG(_(e_printf));
+    emsg(_(e_printf));
   } else {
     (*idxp)++;
     bool err = false;
@@ -590,7 +590,7 @@ static const char *tv_str(typval_T *tvs, int *idxp, char **const tofree)
   const char *s = NULL;
 
   if (tvs[idx].v_type == VAR_UNKNOWN) {
-    EMSG(_(e_printf));
+    emsg(_(e_printf));
   } else {
     (*idxp)++;
     if (tvs[idx].v_type == VAR_STRING || tvs[idx].v_type == VAR_NUMBER) {
@@ -627,7 +627,7 @@ static const void *tv_ptr(const typval_T *const tvs, int *const idxp)
 #undef OFF
   const int idx = *idxp - 1;
   if (tvs[idx].v_type == VAR_UNKNOWN) {
-    EMSG(_(e_printf));
+    emsg(_(e_printf));
     return NULL;
   } else {
     (*idxp)++;
@@ -652,7 +652,7 @@ static float_T tv_float(typval_T *const tvs, int *const idxp)
   float_T f = 0;
 
   if (tvs[idx].v_type == VAR_UNKNOWN) {
-    EMSG(_(e_printf));
+    emsg(_(e_printf));
   } else {
     (*idxp)++;
     if (tvs[idx].v_type == VAR_FLOAT) {
@@ -660,7 +660,7 @@ static float_T tv_float(typval_T *const tvs, int *const idxp)
     } else if (tvs[idx].v_type == VAR_NUMBER) {
       f = (float_T)tvs[idx].vval.v_number;
     } else {
-      EMSG(_("E807: Expected Float argument for printf()"));
+      emsg(_("E807: Expected Float argument for printf()"));
     }
   }
   return f;
@@ -706,7 +706,7 @@ static float_T tv_float(typval_T *const tvs, int *const idxp)
 /// Append a formatted value to the string
 ///
 /// @see vim_vsnprintf_typval().
-int vim_snprintf_add(char *str, size_t str_m, char *fmt, ...)
+int vim_snprintf_add(char *str, size_t str_m, const char *fmt, ...)
   FUNC_ATTR_PRINTF(3, 4)
 {
   const size_t len = strlen(str);
@@ -999,7 +999,7 @@ int vim_vsnprintf_typval(char *str, size_t str_m, const char *fmt, va_list ap, t
               size_t i = 0;
 
               for (p1 = (char_u *)str_arg; *p1;
-                   p1 += mb_ptr2len(p1)) {
+                   p1 += utfc_ptr2len(p1)) {
                 i += (size_t)utf_ptr2cells(p1);
                 if (i > precision) {
                   break;
@@ -1184,7 +1184,7 @@ int vim_vsnprintf_typval(char *str, size_t str_m, const char *fmt, va_list ap, t
             zero_padding_insertion_ind++;
           }
           if (zero_padding_insertion_ind + 1 < str_arg_l
-              && tmp[zero_padding_insertion_ind]   == '0'
+              && tmp[zero_padding_insertion_ind] == '0'
               && (tmp[zero_padding_insertion_ind + 1] == 'x'
                   || tmp[zero_padding_insertion_ind + 1] == 'X'
                   || tmp[zero_padding_insertion_ind + 1] == 'b'
@@ -1456,7 +1456,7 @@ int vim_vsnprintf_typval(char *str, size_t str_m, const char *fmt, va_list ap, t
   }
 
   if (tvs && tvs[arg_idx - 1].v_type != VAR_UNKNOWN) {
-    EMSG(_("E767: Too many arguments to printf()"));
+    emsg(_("E767: Too many arguments to printf()"));
   }
 
   // return the number of characters formatted (excluding trailing nul