diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-02-25 12:45:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 12:45:53 -0500 |
| commit | a2b6e5ed4ecdd2733ee71656ee0df6f2ce4aaf6c (patch) | |
| tree | 4a435566026c5b5939f186483a96c02d83e25056 /src | |
| parent | e55ded00cfb8432a7bc8af40b477aaf0cba70405 (diff) | |
| parent | 34d12e7dd732632d9fa89312aa51203e2a80faf4 (diff) | |
| download | rneovim-a2b6e5ed4ecdd2733ee71656ee0df6f2ce4aaf6c.tar.gz rneovim-a2b6e5ed4ecdd2733ee71656ee0df6f2ce4aaf6c.tar.bz2 rneovim-a2b6e5ed4ecdd2733ee71656ee0df6f2ce4aaf6c.zip | |
Merge pull request #14004 from erw7/fix-fic
option: fix problem with fileignorecase not being set properly
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval/funcs.c | 2 | ||||
| -rw-r--r-- | src/nvim/path.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 79cb1385ea..8c8e0d568b 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -4131,7 +4131,9 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) #ifdef _WIN64 "win64", #endif +#ifndef CASE_INSENSITIVE_FILENAME "fname_case", +#endif #ifdef HAVE_ACL "acl", #endif diff --git a/src/nvim/path.c b/src/nvim/path.c index 2de7e00ddb..3e1713fbdd 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -342,7 +342,7 @@ int path_fnamencmp(const char *const fname1, const char *const fname2, p1 += utfc_ptr2len((const char_u *)p1); p2 += utfc_ptr2len((const char_u *)p2); } - return c1 - c2; + return p_fic ? CH_FOLD(c1) - CH_FOLD(c2) : c1 - c2; #else if (p_fic) { return mb_strnicmp((const char_u *)fname1, (const char_u *)fname2, len); |