Move `default-file-system-ignore-case' to C; fix bug in directory hash tables src/ChangeLog addition: 2010-05-16 Aidan Kehoe <kehoea@parhasard.net> Move `default-file-system-ignore-case' to C; pay attention to it in creating the directory hash tables for #'locate-file. Fix a bug where #'eq was specified when creating directory hash tables in dired.c. * config.h.in (DEFAULT_FILE_SYSTEM_IGNORE_CASE): This is 1 on Darwin. * dired.c (make_directory_hash_table): If #'file-system-ignore-case-p gives non-nil for a directory, created the associated hash table with #'equalp as its test. Never use #'eq as a directory hash table test. * fileio.c (vars_of_fileio): Move `default-file-system-ignore-case' here, so it can be a constant boolean reflecting a compile-time #define. * lisp.h: Update the declaration of make_directory_hash_table; remove the declaration of wasteful_word_to_lisp, which was #ifdef'd out. * lread.c (Flocate_file): Take out a debugging statement from this function. (locate_file_refresh_hashing): Call make_directory_hash_table with a Lisp string, not an Ibyte pointer. (vars_of_lread): If DEFAULT_FILE_SYSTEM_IGNORE_CASE is defined, use #'equalp as the hash table test for locate-file-hash-table, not #'equal. * s/win32-common.h (DEFAULT_FILE_SYSTEM_IGNORE_CASE): Case should normally be ignored in file names on Win32. lisp/ChangeLog addition: 2010-05-16 Aidan Kehoe <kehoea@parhasard.net> * files.el (default-file-system-ignore-case): Move this to fileio.c, where it's a constant boolean variable initialised at dump time.

--- a/src/dired.c	Thu Apr 29 16:16:47 2010 +0100
+++ b/src/dired.c	Sun May 16 12:33:21 2010 +0100
@@ -46,6 +46,7 @@
 Lisp_Object Qfile_name_completion;
 Lisp_Object Qfile_name_all_completions;
 Lisp_Object Qfile_attributes;
+Lisp_Object Qfile_system_ignore_case_p;
 
 static Lisp_Object
 close_directory_unwind (Lisp_Object unwind_obj)
@@ -777,14 +778,21 @@
 
 
 Lisp_Object
-make_directory_hash_table (const Ibyte *path)
+make_directory_hash_table (Lisp_Object path)
 {
   DIR *d;
-  if ((d = qxe_opendir (path)))
+  if ((d = qxe_opendir (XSTRING_DATA (path))))
     {
+      Lisp_Object hash_table_test = Qequal, hash = Qnil;
       DIRENTRY *dp;
-      Lisp_Object hash =
-	make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, Qeq);
+
+      if (!UNBOUNDP (XSYMBOL_FUNCTION (Qfile_system_ignore_case_p))
+          && !NILP (call1 (Qfile_system_ignore_case_p, path)))
+        {
+          hash_table_test = Qequalp;
+        }
+
+      hash = make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, hash_table_test);
 
       while ((dp = qxe_readdir (d)))
 	{
@@ -942,6 +950,7 @@
   DEFSYMBOL (Qfile_name_completion);
   DEFSYMBOL (Qfile_name_all_completions);
   DEFSYMBOL (Qfile_attributes);
+  DEFSYMBOL (Qfile_system_ignore_case_p);
 
   DEFSUBR (Fdirectory_files);
   DEFSUBR (Ffile_name_completion);