aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-07-14 13:46:56 +0300
committerEli Zaretskii2012-07-14 13:46:56 +0300
commitfbf31a9c2c08c86a7ab490cb7b920245b829a61d (patch)
treedc1bb80322b20f41270e673cc0aeca2a9bb4b504 /src
parent8a05d57a7d691085200b64f5e56a6232e78c6ac4 (diff)
downloademacs-fbf31a9c2c08c86a7ab490cb7b920245b829a61d.tar.gz
emacs-fbf31a9c2c08c86a7ab490cb7b920245b829a61d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog12
-rw-r--r--src/dired.c3
-rw-r--r--src/fileio.c6
-rw-r--r--src/s/msdos.h4
4 files changed, 12 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7274fc4e4d8..716ebbadab6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
12012-07-14 Eli Zaretskii <eliz@gnu.org>
2
3 Remove FILE_SYSTEM_CASE.
4 * s/msdos.h (FILE_SYSTEM_CASE): Don't define.
5
6 * fileio.c (FILE_SYSTEM_CASE): Don't define.
7 (Ffile_name_directory, Fexpand_file_name): Don't use FILE_SYSTEM_CASE.
8 Fixes problems on MS-DOS with Vtemp_file_name_pattern when
9 call-process-region passes it through expand-file-name.
10
11 * dired.c (file_name_completion): Don't use FILE_SYSTEM_CASE.
12
12012-07-12 Andreas Schwab <schwab@linux-m68k.org> 132012-07-12 Andreas Schwab <schwab@linux-m68k.org>
2 14
3 Fix crash when creating indirect buffer (Bug#11917) 15 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
470 470
471 CHECK_STRING (file); 471 CHECK_STRING (file);
472 472
473#ifdef FILE_SYSTEM_CASE
474 file = FILE_SYSTEM_CASE (file);
475#endif
476 bestmatch = Qnil; 473 bestmatch = Qnil;
477 encoded_file = encoded_dir = Qnil; 474 encoded_file = encoded_dir = Qnil;
478 GCPRO5 (file, dirname, bestmatch, encoded_file, encoded_dir); 475 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/>. */
83 83
84#include "commands.h" 84#include "commands.h"
85 85
86#ifndef FILE_SYSTEM_CASE
87#define FILE_SYSTEM_CASE(filename) (filename)
88#endif
89
90/* Nonzero during writing of auto-save files */ 86/* Nonzero during writing of auto-save files */
91static int auto_saving; 87static int auto_saving;
92 88
@@ -334,7 +330,6 @@ Given a Unix syntax file name, returns a string ending in slash. */)
334 return STRINGP (handled_name) ? handled_name : Qnil; 330 return STRINGP (handled_name) ? handled_name : Qnil;
335 } 331 }
336 332
337 filename = FILE_SYSTEM_CASE (filename);
338#ifdef DOS_NT 333#ifdef DOS_NT
339 beg = (char *) alloca (SBYTES (filename) + 1); 334 beg = (char *) alloca (SBYTES (filename) + 1);
340 memcpy (beg, SSDATA (filename), SBYTES (filename) + 1); 335 memcpy (beg, SSDATA (filename), SBYTES (filename) + 1);
@@ -864,7 +859,6 @@ filesystem tree, not (expand-file-name ".." dirname). */)
864 UNGCPRO; 859 UNGCPRO;
865 } 860 }
866 } 861 }
867 name = FILE_SYSTEM_CASE (name);
868 multibyte = STRING_MULTIBYTE (name); 862 multibyte = STRING_MULTIBYTE (name);
869 if (multibyte != STRING_MULTIBYTE (default_directory)) 863 if (multibyte != STRING_MULTIBYTE (default_directory))
870 { 864 {
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 */
94:se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\ 94:se=</SO>:so=<SO>:us=<UL>:ue=</UL>:md=<BD>:mh=<DIM>:mb=<BL>:mr=<RV>:me=<NV>:\
95:AB=<BG %d>:AF=<FG %d>:op=<DefC>:" 95:AB=<BG %d>:AF=<FG %d>:op=<DefC>:"
96 96
97/* Define this to a function (Fdowncase, Fupcase) if your file system
98 likes that. */
99#define FILE_SYSTEM_CASE Fmsdos_downcase_filename
100
101/* Define this to be the separator between devices and paths. */ 97/* Define this to be the separator between devices and paths. */
102#define DEVICE_SEP ':' 98#define DEVICE_SEP ':'
103 99