diff options
| author | Stefan Monnier | 2012-07-17 07:52:00 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-07-17 07:52:00 -0400 |
| commit | 4dc7c8d5795458e89d19b59f64760e155c2cd70b (patch) | |
| tree | 2eb1ef73d69102f0ebee4e39056078adcdd49529 /src/fileio.c | |
| parent | 2143fa32671374cdef26fdb24355bf690728a344 (diff) | |
| parent | fbf31a9c2c08c86a7ab490cb7b920245b829a61d (diff) | |
| download | emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.tar.gz emacs-4dc7c8d5795458e89d19b59f64760e155c2cd70b.zip | |
Merge from emacs-24
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/fileio.c b/src/fileio.c index 2b55b6f6bd1..185dd650438 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -84,10 +84,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 84 | 84 | ||
| 85 | #include "commands.h" | 85 | #include "commands.h" |
| 86 | 86 | ||
| 87 | #ifndef FILE_SYSTEM_CASE | ||
| 88 | #define FILE_SYSTEM_CASE(filename) (filename) | ||
| 89 | #endif | ||
| 90 | |||
| 91 | /* Nonzero during writing of auto-save files. */ | 87 | /* Nonzero during writing of auto-save files. */ |
| 92 | static int auto_saving; | 88 | static int auto_saving; |
| 93 | 89 | ||
| @@ -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 = alloca (SBYTES (filename) + 1); | 334 | beg = alloca (SBYTES (filename) + 1); |
| 340 | memcpy (beg, SSDATA (filename), SBYTES (filename) + 1); | 335 | memcpy (beg, SSDATA (filename), SBYTES (filename) + 1); |
| @@ -861,7 +856,6 @@ filesystem tree, not (expand-file-name ".." dirname). */) | |||
| 861 | UNGCPRO; | 856 | UNGCPRO; |
| 862 | } | 857 | } |
| 863 | } | 858 | } |
| 864 | name = FILE_SYSTEM_CASE (name); | ||
| 865 | multibyte = STRING_MULTIBYTE (name); | 859 | multibyte = STRING_MULTIBYTE (name); |
| 866 | if (multibyte != STRING_MULTIBYTE (default_directory)) | 860 | if (multibyte != STRING_MULTIBYTE (default_directory)) |
| 867 | { | 861 | { |