Merge pull request #14004 from erw7/fix-fic

option: fix problem with fileignorecase not being set properly

CMakeLists.txt

@@ -83,6 +83,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 endif()
 
 if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  # Ignore case when comparing filenames on Windows and Mac.
+  set(CASE_INSENSITIVE_FILENAME TRUE)
   # Enable fixing case-insensitive filenames for Windows and Mac.
   set(USE_FNAME_CASE TRUE)
 endif()

config/config.h.in

@@ -40,6 +40,7 @@
 #cmakedefine HAVE_WORKING_LIBINTL
 #cmakedefine HAVE_WSL
 #cmakedefine UNIX
+#cmakedefine CASE_INSENSITIVE_FILENAME
 #cmakedefine USE_FNAME_CASE
 #cmakedefine HAVE_SYS_UIO_H
 #ifdef HAVE_SYS_UIO_H

runtime/doc/eval.txt

@@ -5125,6 +5125,8 @@ has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
 		        iconv		Can use |iconv()| for conversion.
 		        +shellslash	Can use backslashes in filenames (Windows)
 			clipboard	|clipboard| provider is available.
+			fname_case	Case in file names matters (for Darwin and MS-Windows
+					this is not present).
 			mac		MacOS system.
 			nvim		This is Nvim.
 			python2		Legacy Vim |python2| interface. |has-python|

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

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);