Merge remote-tracking branch 'upstream/master' into usermarks

1 files changed, 16 insertions, 2 deletions

diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua
index 669bc99136..a786887bbd 100644
--- a/test/functional/core/path_spec.lua
+++ b/test/functional/core/path_spec.lua
@@ -3,14 +3,16 @@ local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
 local command = helpers.command
-local iswin = helpers.iswin
+local insert = helpers.insert
+local feed = helpers.feed
+local is_os = helpers.is_os
 
 describe('path collapse', function()
   local targetdir
   local expected_path
 
   local function join_path(...)
-    local pathsep = (iswin() and '\\' or '/')
+    local pathsep = (is_os('win') and '\\' or '/')
     return table.concat({...}, pathsep)
   end
 
@@ -54,3 +56,15 @@ describe('path collapse', function()
     eq(expected_path, eval('expand("%:p")'))
   end)
 end)
+
+describe('file search', function()
+  before_each(clear)
+
+  it('find multibyte file name in line #20517', function()
+    command('cd test/functional/fixtures')
+    insert('filename_with_unicode_ααα')
+    eq('', eval('expand("%")'))
+    feed('gf')
+    eq('filename_with_unicode_ααα', eval('expand("%:t")'))
+  end)
+end)