From b5dfdf0669c4ee1293d558543d7d96a374ac2e1d Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Sun, 23 Oct 2016 17:07:36 -0700
Subject: [PATCH] vim-patch:7.4.1742

Problem:    strgetchar() does not work correctly.
Solution:   use mb_cptr2len().  Add a test. (Naruhiko Nishino)

https://github.com/vim/vim/commit/5d18e0eca59ffbba22c7f7c91c9f99d672095728
---
 src/nvim/eval.c    | 2 +-
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 2826627215..9fc5256a7e 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -15640,7 +15640,7 @@ static void f_strgetchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
         break;
       }
       charidx--;
-      byteidx += mb_char2len(str[byteidx]);
+      byteidx += mb_cptr2len(str + byteidx);
     }
   }
 }
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 2b6dffd38d..389e89b466 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -701,7 +701,7 @@ static int included_patches[] = {
   // 1745 NA
   // 1744 NA
   // 1743 NA
-  // 1742,
+  1742,
   1741,
   1740,
   // 1739,