1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 11c1897153..0ee8e2bd85 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -550,7 +550,7 @@ size_t mb_string2cells(const char_u *str)
   size_t clen = 0;
 
   for (const char_u *p = str; *p != NUL; p += (*mb_ptr2len)(p)) {
-    clen += (*mb_ptr2cells)(p);
+    clen += utf_ptr2cells(p);
   }
 
   return clen;
@@ -2124,8 +2124,9 @@ static char_u *iconv_string(const vimconv_T *const vcp, char_u *str,
        * conversion from 'encoding' to something else.  In other
        * situations we don't know what to skip anyway. */
       *to++ = '?';
-      if ((*mb_ptr2cells)((char_u *)from) > 1)
+      if (utf_ptr2cells((char_u *)from) > 1) {
         *to++ = '?';
+      }
       l = utfc_ptr2len_len((const char_u *)from, (int)fromlen);
       from += l;
       fromlen -= l;