From 3e2daf7125242f647fc419f53f6cd55967db5ffa Mon Sep 17 00:00:00 2001
From: Patrick <patrick@bitscope.com>
Date: Fri, 1 Jul 2016 15:35:57 +1000
Subject: vim-patch:7.4.1140

Problem:    Recognizing <sid> does not work when the language is Turkish.
            (Christian Brabandt)
Solution:   Use MB_STNICMP() instead of STNICMP().

https://github.com/vim/vim/commit/e266d6d664d6d743c79797af400b2c01ec746216

Note: Added new test
---
 src/nvim/eval.c    | 10 +++++++---
 src/nvim/version.c |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index ac0daa226a..3594848a70 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -20155,11 +20155,15 @@ theend:
  */
 static int eval_fname_script(char_u *p)
 {
-  if (p[0] == '<' && (STRNICMP(p + 1, "SID>", 4) == 0
-                      || STRNICMP(p + 1, "SNR>", 4) == 0))
+  // Use mb_stricmp() because in Turkish comparing the "I" may not work with
+  // the standard library function.
+  if (p[0] == '<' && (mb_strnicmp(p + 1, (char_u *)"SID>", 4) == 0
+                      || mb_strnicmp(p + 1, (char_u *)"SNR>", 4) == 0)) {
     return 5;
-  if (p[0] == 's' && p[1] == ':')
+  }
+  if (p[0] == 's' && p[1] == ':') {
     return 2;
+  }
   return 0;
 }
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b2c6b332d1..cc0a9b80c6 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -554,7 +554,7 @@ static int included_patches[] = {
   1143,
   1142,
   1141,
-  // 1140,
+  1140,
   // 1139 NA
   // 1138 NA
   1137,
-- 
cgit