diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2005-03-03 19:59:12 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2005-03-03 19:59:12 +0000 |
| commit | b87ed9f079cc3c16a66cddf518521417c0e4cdf5 (patch) | |
| tree | 9b7ffd3da3884a906ed7656497cae6911ac902b5 | |
| parent | 075a82d59cb7a57283f5d4a692538ed7973eb34a (diff) | |
| download | emacs-b87ed9f079cc3c16a66cddf518521417c0e4cdf5.tar.gz | |
(FILE_SYSTEM_CASE): Define macro if not already defined.
(Ffile_name_directory): Use FILE_SYSTEM_CASE unconditionally.
(Fexpand_file_name): Likewise.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/fileio.c | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 230a72d903e..24a2e7ea098 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 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; no longer special-case VMS. Add bogus return value. diff --git a/src/fileio.c b/src/fileio.c index 219ad375e4d..3ea474cf94a 100644 --- 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); @@ -1083,10 +1085,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 |