diff options
author | Eli Zaretskii <eliz@gnu.org> | 2012-07-14 13:46:56 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2012-07-14 13:46:56 +0300 |
commit | fbf31a9c2c08c86a7ab490cb7b920245b829a61d (patch) | |
tree | dc1bb80322b20f41270e673cc0aeca2a9bb4b504 | |
parent | 8a05d57a7d691085200b64f5e56a6232e78c6ac4 (diff) | |
download | emacs-fbf31a9c2c08c86a7ab490cb7b920245b829a61d.tar.gz |
Don't use FILE_SYSTEM_CASE in MS-DOS, or anywhere else.
src/s/msdos.h (FILE_SYSTEM_CASE): Don't define.
src/fileio.c (FILE_SYSTEM_CASE): Don't define.
(Ffile_name_directory, Fexpand_file_name): Don't use FILE_SYSTEM_CASE.
Fixes problems on MS-DOS with Vtemp_file_name_pattern when
call-process-region passes it through expand-file-name.
src/dired.c (file_name_completion): Don't use FILE_SYSTEM_CASE.
admin/CPP-DEFINES: Remove FILE_SYSTEM_CASE.
-rw-r--r-- | admin/CPP-DEFINES | 1 | ||||
-rw-r--r-- | admin/ChangeLog | 4 | ||||
-rw-r--r-- | src/ChangeLog | 12 | ||||
-rw-r--r-- | src/dired.c | 3 | ||||
-rw-r--r-- | src/fileio.c | 6 | ||||
-rw-r--r-- | src/s/msdos.h | 4 |
6 files changed, 16 insertions, 14 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index c5f8c7ab31f..c084a94188d 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -101,7 +101,6 @@ EMACS_CONFIGURATION EMACS_CONFIG_OPTIONS EMACS_INT EMACS_UINT -FILE_SYSTEM_CASE FLOAT_CHECK_DOMAIN GC_LISP_OBJECT_ALIGNMENT GC_MARK_SECONDARY_STACK diff --git a/admin/ChangeLog b/admin/ChangeLog index ca4d85e4e29..75079a335c9 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2012-07-14 Eli Zaretskii <eliz@gnu.org> + + * CPP-DEFINES: Remove FILE_SYSTEM_CASE. + 2012-06-01 Chong Yidong <cyd@gnu.org> * Version 24.1 released. diff --git a/src/ChangeLog b/src/ChangeLog index 7274fc4e4d8..716ebbadab6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2012-07-14 Eli Zaretskii <eliz@gnu.org> + + Remove FILE_SYSTEM_CASE. + * s/msdos.h (FILE_SYSTEM_CASE): Don't define. + + * fileio.c (FILE_SYSTEM_CASE): Don't define. + (Ffile_name_directory, Fexpand_file_name): Don't use FILE_SYSTEM_CASE. + Fixes problems on MS-DOS with Vtemp_file_name_pattern when + call-process-region passes it through expand-file-name. + + * dired.c (file_name_completion): Don't use FILE_SYSTEM_CASE. + 2012-07-12 Andreas Schwab <schwab@linux-m68k.org> Fix crash when creating indirect buffer (Bug#11917) diff --git a/src/dired.c b/src/dired.c index 9b0f94a0760..8665fd0dc6d 100644 --- a/src/dired.c +++ b/src/dired.c @@ -470,9 +470,6 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v CHECK_STRING (file); -#ifdef FILE_SYSTEM_CASE - file = FILE_SYSTEM_CASE (file); -#endif bestmatch = Qnil; encoded_file = encoded_dir = Qnil; GCPRO5 (file, dirname, bestmatch, encoded_file, encoded_dir); diff --git a/src/fileio.c b/src/fileio.c index 0d1a87b65b7..3b8ed143005 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -83,10 +83,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "commands.h" -#ifndef FILE_SYSTEM_CASE -#define FILE_SYSTEM_CASE(filename) (filename) -#endif - /* Nonzero during writing of auto-save files */ static int auto_saving; @@ -334,7 +330,6 @@ Given a Unix syntax file name, returns a string ending in slash. */) return STRINGP (handled_name) ? handled_name : Qnil; } - filename = FILE_SYSTEM_CASE (filename); #ifdef DOS_NT beg = (char *) alloca (SBYTES (filename) + 1); memcpy (beg, SSDATA (filename), SBYTES (filename) + 1); @@ -864,7 +859,6 @@ filesystem tree, not (expand-file-name ".." dirname). */) UNGCPRO; } } - name = FILE_SYSTEM_CASE (name); multibyte = STRING_MULTIBYTE (name); if (multibyte != STRING_MULTIBYTE (default_directory)) { diff --git a/src/s/msdos.h b/src/s/msdos.h index cde24147c57..d2058f2e425 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -94,10 +94,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ :se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\ :AB=<BG %d>:AF=<FG %d>:op=<DefC>:" -/* Define this to a function (Fdowncase, Fupcase) if your file system - likes that. */ -#define FILE_SYSTEM_CASE Fmsdos_downcase_filename - /* Define this to be the separator between devices and paths. */ #define DEVICE_SEP ':' |