From c155895220d9d499ee84a9d88a87753b9927d35d Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 3 Mar 2005 20:17:24 +0000 Subject: [PATCH] (FILE_SYSTEM_CASE): Define macro if not already defined. (Ffile_name_directory): Use FILE_SYSTEM_CASE unconditionally. (Fexpand_file_name): Likewise. --- src/ChangeLog | 6 ++++++ src/fileio.c | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 67215ee5176..1e8aed6a54f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-03-03 Thien-Thi Nguyen + + * 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 * emacs.c (Fkill_emacs): Use EXIT_SUCCESS; diff --git a/src/fileio.c b/src/fileio.c index e8a4ad09101..196bb924341 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -148,6 +148,10 @@ extern int use_file_dialog; # define lstat stat #endif +#ifndef FILE_SYSTEM_CASE +#define FILE_SYSTEM_CASE(filename) (filename) +#endif + /* Nonzero during writing of auto-save files */ int auto_saving; @@ -413,9 +417,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 = SDATA (filename); #ifdef DOS_NT beg = strcpy (alloca (strlen (beg) + 1), beg); @@ -1124,10 +1126,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 = SDATA (name); #ifdef DOS_NT @@ -6385,7 +6384,7 @@ and `read-file-name-function'. */) { Lisp_Object val1 = double_dollars (val); tem = Fsymbol_value (Qfile_name_history); - if (history_delete_duplicates) + if (history_delete_duplicates) XSETCDR (tem, Fdelete (val1, XCDR(tem))); XSETCAR (tem, val1); } -- 2.39.2