mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Don't use FILE_SYSTEM_CASE in MS-DOS, or anywhere else.

Browse Source 
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.
This commit is contained in:
Eli Zaretskii 2012-07-14 13:46:56 +03:00
parent 8a05d57a7d
commit fbf31a9c2c
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/CPP-DEFINES
View File

@ -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

4
admin/ChangeLog
View File

@ -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.

12
src/ChangeLog
View File

@ -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)

3
src/dired.c
View File

@ -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);

6
src/fileio.c
View File

@ -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))
{

4
src/s/msdos.h
View File

@ -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 ':'