Mercurial > emacs
changeset 60354:b9a43f92b898
(FILE_SYSTEM_CASE): Define macro if not already defined.
(Ffile_name_directory): Use FILE_SYSTEM_CASE unconditionally.
(Fexpand_file_name): Likewise.
| author | Thien-Thi Nguyen <ttn@gnuvola.org> |
|---|---|
| date | Thu, 03 Mar 2005 20:15:11 +0000 |
| parents | ee6146798de1 |
| children | ac7e7ef3d594 |
| files | src/fileio.c |
| diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fileio.c Thu Mar 03 20:08:21 2005 +0000 +++ b/src/fileio.c Thu Mar 03 20:15:11 2005 +0000 @@ -148,6 +148,10 @@ # 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 @@ 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 @@ /* 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 @@ { 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); }