[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108069: Don't use FILE_SYSTEM_CASE in MS-DOS, or anywhere else.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108069
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-07-14 13:46:56 +0300
message:
  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.
modified:
  admin/CPP-DEFINES
  admin/ChangeLog
  src/ChangeLog
  src/dired.c
  src/fileio.c
  src/s/msdos.h

=== modified file 'admin/CPP-DEFINES'
--- a/admin/CPP-DEFINES 2011-11-20 09:24:06 +0000
+++ b/admin/CPP-DEFINES 2012-07-14 10:46:56 +0000
@@ -101,7 +101,6 @@
 EMACS_CONFIG_OPTIONS
 EMACS_INT
 EMACS_UINT
-FILE_SYSTEM_CASE
 FLOAT_CHECK_DOMAIN
 GC_LISP_OBJECT_ALIGNMENT
 GC_MARK_SECONDARY_STACK

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-06-01 09:51:00 +0000
+++ b/admin/ChangeLog   2012-07-14 10:46:56 +0000
@@ -1,3 +1,7 @@
+2012-07-14  Eli Zaretskii  <address@hidden>
+
+       * CPP-DEFINES: Remove FILE_SYSTEM_CASE.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-12 07:12:24 +0000
+++ b/src/ChangeLog     2012-07-14 10:46:56 +0000
@@ -1,3 +1,15 @@
+2012-07-14  Eli Zaretskii  <address@hidden>
+
+       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  <address@hidden>
 
        Fix crash when creating indirect buffer (Bug#11917)

=== modified file 'src/dired.c'
--- a/src/dired.c       2012-01-19 07:21:25 +0000
+++ b/src/dired.c       2012-07-14 10:46:56 +0000
@@ -470,9 +470,6 @@
 
   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);

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2012-04-20 17:34:51 +0000
+++ b/src/fileio.c      2012-07-14 10:46:56 +0000
@@ -83,10 +83,6 @@
 
 #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 @@
       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 @@
        UNGCPRO;
       }
   }
-  name = FILE_SYSTEM_CASE (name);
   multibyte = STRING_MULTIBYTE (name);
   if (multibyte != STRING_MULTIBYTE (default_directory))
     {

=== modified file 'src/s/msdos.h'
--- a/src/s/msdos.h     2012-01-19 07:21:25 +0000
+++ b/src/s/msdos.h     2012-07-14 10:46:56 +0000
@@ -94,10 +94,6 @@
 :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 ':'