diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-07-09 16:55:41 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-09 16:55:41 -0400 |
| commit | 5573e1a350dd2df65e21ed48c14cf89f5e9c0e7a (patch) | |
| tree | 19f092fb10955f40e476baf68026f205f23134d7 | |
| parent | ef72303a1ff862fde6d9399941c091c0a0692cce (diff) | |
| parent | 3e2daf7125242f647fc419f53f6cd55967db5ffa (diff) | |
| download | rneovim-5573e1a350dd2df65e21ed48c14cf89f5e9c0e7a.tar.gz rneovim-5573e1a350dd2df65e21ed48c14cf89f5e9c0e7a.tar.bz2 rneovim-5573e1a350dd2df65e21ed48c14cf89f5e9c0e7a.zip | |
Merge #4991 'vim-patch:7.4.1140'
| -rw-r--r-- | src/nvim/eval.c | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/viml/lang_spec.lua | 22 |
3 files changed, 30 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 591ed50cfd..55fa974797 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -20169,11 +20169,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 8aa3071395..53551d81cf 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -559,7 +559,7 @@ static int included_patches[] = { 1143, 1142, 1141, - // 1140, + 1140, // 1139 NA // 1138 NA 1137, diff --git a/test/functional/viml/lang_spec.lua b/test/functional/viml/lang_spec.lua new file mode 100644 index 0000000000..a27e18f695 --- /dev/null +++ b/test/functional/viml/lang_spec.lua @@ -0,0 +1,22 @@ +local helpers = require('test.functional.helpers')(after_each) +local clear, eval, eq = helpers.clear, helpers.eval, helpers.eq +local execute, source = helpers.execute, helpers.source + +describe('viml', function() + before_each(clear) + + it('parses `<SID>` with turkish locale', function() + execute('lang ctype tr_TR.UTF-8') + if string.find(eval('v:errmsg'), '^E197: ') then + pending("Locale tr_TR.UTF-8 not supported") + return + end + source([[ + func! <sid>_dummy_function() + echo 1 + endfunc + au VimEnter * call <sid>_dummy_function() + ]]) + eq(nil, string.find(eval('v:errmsg'), '^E129')) + end) +end) |