diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/emacs.c | 1 | ||||
| -rw-r--r-- | src/fileio.c | 9 | ||||
| -rw-r--r-- | src/lisp.h | 1 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3c1c603c669..b4bf786ca93 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2009-10-23 Stefan Monnier <monnier@iro.umontreal.ca> + + * fileio.c (syms_of_fileio): Initialize Vdirectory_sep_char. + (init_fileio_once): + * lisp.h (init_fileio_once): Remove. + * emacs.c (main): Don't call init_fileio_once. + 2009-10-23 Dan Nicolaescu <dann@ics.uci.edu> * puresize.h (BASE_PURESIZE): Increase to 1430000. diff --git a/src/emacs.c b/src/emacs.c index 2724aeefd48..3f43904fa0c 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1384,7 +1384,6 @@ main (int argc, char **argv) syms_of_coding (); /* This should be after syms_of_fileio. */ init_window_once (); /* Init the window system. */ - init_fileio_once (); /* Must precede any path manipulation. */ #ifdef HAVE_WINDOW_SYSTEM init_fringe_once (); /* Swap bitmaps if necessary. */ #endif /* HAVE_WINDOW_SYSTEM */ diff --git a/src/fileio.c b/src/fileio.c index b83ef6fe45c..146e77c14ec 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5458,14 +5458,6 @@ Fread_file_name (prompt, dir, default_filename, mustmatch, initial, predicate) void -init_fileio_once () -{ - /* Must be set before any path manipulation is performed. */ - XSETFASTINT (Vdirectory_sep_char, '/'); -} - - -void syms_of_fileio () { Qoperations = intern ("operations"); @@ -5600,6 +5592,7 @@ of file names regardless of the current language environment. */); DEFVAR_LISP ("directory-sep-char", &Vdirectory_sep_char, doc: /* Directory separator character for built-in functions that return file names. The value is always ?/. Don't use this variable, just use `/'. */); + XSETFASTINT (Vdirectory_sep_char, '/'); DEFVAR_LISP ("file-name-handler-alist", &Vfile_name_handler_alist, doc: /* *Alist of elements (REGEXP . HANDLER) for file names handled specially. diff --git a/src/lisp.h b/src/lisp.h index 4685578a417..12f06ad6eda 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2984,7 +2984,6 @@ extern Lisp_Object close_file_unwind P_ ((Lisp_Object)); extern void report_file_error P_ ((const char *, Lisp_Object)) NO_RETURN; extern int internal_delete_file P_ ((Lisp_Object)); extern void syms_of_fileio P_ ((void)); -extern void init_fileio_once P_ ((void)); extern Lisp_Object make_temp_name P_ ((Lisp_Object, int)); EXFUN (Fmake_symbolic_link, 3); extern Lisp_Object Qdelete_file; |