diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-12-07 16:45:31 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-12-07 16:45:31 +0200 |
| commit | 080fd64974060e6b47573c94af2b80f1a5f3ef2c (patch) | |
| tree | 16e92fcf37207dfd19d1ae14e57b0bde2121f3a5 /src/callproc.c | |
| parent | 94ae1542354539a0660b21cf3b7a5143139b8375 (diff) | |
| download | emacs-080fd64974060e6b47573c94af2b80f1a5f3ef2c.tar.gz emacs-080fd64974060e6b47573c94af2b80f1a5f3ef2c.tar.bz2 emacs-080fd64974060e6b47573c94af2b80f1a5f3ef2c.zip | |
Fixed initialization code and default-printer-name.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/callproc.c b/src/callproc.c index 3317c1203bc..2966711978b 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1606,17 +1606,24 @@ init_callproc (void) source directory. */ if (data_dir == 0) { - Lisp_Object tem, tem1, srcdir; + Lisp_Object tem, tem1, tem2, srcdir; +#ifdef WINDOWSNT + /* PATH_DUMPLOADSEARCH is in ANSI codepage; convert to UTF-8. */ + char dumpload_dir[MAX_UTF8_PATH]; + + filename_from_ansi (PATH_DUMPLOADSEARCH, dumpload_dir); + tem2 = build_unibyte_string (dumpload_dir); +#else + tem2 = build_unibyte_string (PATH_DUMPLOADSEARCH); +#endif - srcdir = Fexpand_file_name (build_string ("../src/"), - build_unibyte_string (PATH_DUMPLOADSEARCH)); + srcdir = Fexpand_file_name (build_string ("../src/"), tem2); tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory); tem1 = Ffile_exists_p (tem); if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1)) { Lisp_Object newdir; - newdir = Fexpand_file_name (build_string ("../etc/"), - build_unibyte_string (PATH_DUMPLOADSEARCH)); + newdir = Fexpand_file_name (build_string ("../etc/"), tem2); tem = Fexpand_file_name (build_string ("GNU"), newdir); tem1 = Ffile_exists_p (tem); if (!NILP (tem1)) |