Mercurial > emacs
changeset 105726:b0c56106af54
* 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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 23 Oct 2009 17:33:52 +0000 |
| parents | 597007306f48 |
| children | 65c5d19965b2 |
| files | src/ChangeLog src/emacs.c src/fileio.c src/lisp.h |
| diffstat | 4 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 23 17:26:06 2009 +0000 +++ b/src/ChangeLog Fri Oct 23 17:33:52 2009 +0000 @@ -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.
--- a/src/emacs.c Fri Oct 23 17:26:06 2009 +0000 +++ b/src/emacs.c Fri Oct 23 17:33:52 2009 +0000 @@ -1384,7 +1384,6 @@ 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 */
--- a/src/fileio.c Fri Oct 23 17:26:06 2009 +0000 +++ b/src/fileio.c Fri Oct 23 17:33:52 2009 +0000 @@ -5458,14 +5458,6 @@ 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 @@ 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.
--- a/src/lisp.h Fri Oct 23 17:26:06 2009 +0000 +++ b/src/lisp.h Fri Oct 23 17:33:52 2009 +0000 @@ -2984,7 +2984,6 @@ 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;