(FILE_SYSTEM_CASE): Define macro if not already defined.

(Ffile_name_directory): Use FILE_SYSTEM_CASE unconditionally.
(Fexpand_file_name): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6c66d498f3ab8d900aa53b8537f024d4475a71d9..2384b07b428ab08ee3cf46a460dc0a3a9fce3696 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-03  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * fileio.c (FILE_SYSTEM_CASE): Define macro if not already defined.
+       (Ffile_name_directory): Use FILE_SYSTEM_CASE unconditionally.
+       (Fexpand_file_name): Likewise.
+
 2005-03-03  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * emacs.c (Fkill_emacs): Use EXIT_SUCCESS;

diff --git a/src/fileio.c b/src/fileio.c
index 53fddacde04422eea12d46264351e108575c65b2..d73976d2226e566e1dab6a7f86e0682497828c00 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -159,6 +159,10 @@ extern int use_dialog_box;
 #  define lstat stat
 #endif
 
+#ifndef FILE_SYSTEM_CASE
+#define FILE_SYSTEM_CASE(filename)  (filename)
+#endif
+
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
@@ -394,9 +398,7 @@ on VMS, perhaps instead a string ending in `:', `]' or `>'.")
   if (!NILP (handler))
     return call2 (handler, Qfile_name_directory, filename);
 
-#ifdef FILE_SYSTEM_CASE
   filename = FILE_SYSTEM_CASE (filename);
-#endif
   beg = XSTRING (filename)->data;
 #ifdef DOS_NT
   beg = strcpy (alloca (strlen (beg) + 1), beg);
@@ -1100,10 +1102,7 @@ See also the function `substitute-in-file-name'.")
   /* Filenames on VMS are always upper case.  */
   name = Fupcase (name);
 #endif
-#ifdef FILE_SYSTEM_CASE
   name = FILE_SYSTEM_CASE (name);
-#endif
-
   nm = XSTRING (name)->data;
 
 #ifdef DOS_NT