diff options
| author | Juanma Barranquero | 2010-06-04 16:13:35 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-06-04 16:13:35 +0200 |
| commit | 087fc47ace7797d2ef36ff167f7befd5f4ba01da (patch) | |
| tree | 0ed8bed24cd9249672b0afaa79caeea8e4ca6dcc /src/lisp.h | |
| parent | 4f201088d33976f3ce04d7e01d1fbd4b6044cbe0 (diff) | |
| download | emacs-087fc47ace7797d2ef36ff167f7befd5f4ba01da.tar.gz emacs-087fc47ace7797d2ef36ff167f7befd5f4ba01da.zip | |
Turn `directory-sep-char' into a noop.
* lisp/subr.el (directory-sep-char): Move from fileio.c and make a defconst.
* src/emacs.c (decode_env_path): Don't check DIRECTORY_SEP,
call dostounix_filename directly.
* src/fileio.c (CORRECT_DIR_SEPS): Remove.
(Ffile_name_directory, directory_file_name, Fexpand_file_name)
(Fsubstitute_in_file_name): Use dostounix_filename instead.
(file_name_as_directory): Use dostounix_filename, DIRECTORY_SEP.
(syms_of_fileio) <directory-sep-char>: Move to subr.el.
* src/lisp.h [WINDOWSNT] (Vdirectory_sep_char): Don't declare.
(DIRECTORY_SEP): Define unconditionally.
* src/w32proc.c (CORRECT_DIR_SEPS): Remove.
(Fw32_short_file_name, Fw32_long_file_name): Use dostounix_filename.
* src/s/ms-w32.h (DIRECTORY_SEP): Remove.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lisp.h b/src/lisp.h index e17931ca366..7c6c85e6356 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3509,16 +3509,10 @@ extern char *egetenv P_ ((char *)); | |||
| 3509 | extern void init_system_name P_ ((void)); | 3509 | extern void init_system_name P_ ((void)); |
| 3510 | 3510 | ||
| 3511 | /* Some systems (e.g., NT) use a different path separator than Unix, | 3511 | /* Some systems (e.g., NT) use a different path separator than Unix, |
| 3512 | in addition to a device separator. Default the path separator | 3512 | in addition to a device separator. Set the path separator |
| 3513 | to '/', and don't test for a device separator in IS_ANY_SEP. */ | 3513 | to '/', and don't test for a device separator in IS_ANY_SEP. */ |
| 3514 | 3514 | ||
| 3515 | #ifdef WINDOWSNT | ||
| 3516 | extern Lisp_Object Vdirectory_sep_char; | ||
| 3517 | #endif | ||
| 3518 | |||
| 3519 | #ifndef DIRECTORY_SEP | ||
| 3520 | #define DIRECTORY_SEP '/' | 3515 | #define DIRECTORY_SEP '/' |
| 3521 | #endif | ||
| 3522 | #ifndef IS_DIRECTORY_SEP | 3516 | #ifndef IS_DIRECTORY_SEP |
| 3523 | #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) | 3517 | #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) |
| 3524 | #endif | 3518 | #endif |