comparison src/w32.c @ 23809:2a6ad78388b3

(check_windows_init_file): Use decode_env_path when using EMACSLOADPATH.
author Geoff Voelker <voelker@cs.washington.edu>
date Thu, 03 Dec 1998 03:14:46 +0000
parents 0dc79ede9c53
children 6bb3dc7f1b48
comparison
equal deleted inserted replaced
23808:54a5f83e7b67 23809:2a6ad78388b3
3026 not exist in the expected place, tell the user. */ 3026 not exist in the expected place, tell the user. */
3027 3027
3028 if (!noninteractive && !inhibit_window_system) 3028 if (!noninteractive && !inhibit_window_system)
3029 { 3029 {
3030 extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p; 3030 extern Lisp_Object Vwindow_system, Vload_path, Qfile_exists_p;
3031 Lisp_Object objs[2];
3031 Lisp_Object full_load_path; 3032 Lisp_Object full_load_path;
3032 Lisp_Object init_file; 3033 Lisp_Object init_file;
3033 int fd; 3034 int fd;
3034 3035
3036 objs[0] = Vload_path;
3037 objs[1] = decode_env_path (0, (getenv ("EMACSLOADPATH")));
3038 full_load_path = Fappend (2, objs);
3035 init_file = build_string ("term/w32-win"); 3039 init_file = build_string ("term/w32-win");
3036 full_load_path = Fcons (build_string (getenv ("EMACSLOADPATH")),
3037 Vload_path);
3038 fd = openp (full_load_path, init_file, ".el:.elc", NULL, 0); 3040 fd = openp (full_load_path, init_file, ".el:.elc", NULL, 0);
3039 if (fd < 0) 3041 if (fd < 0)
3040 { 3042 {
3041 Lisp_Object load_path_print = Fprin1_to_string (full_load_path, Qnil); 3043 Lisp_Object load_path_print = Fprin1_to_string (full_load_path, Qnil);
3042 char *init_file_name = XSTRING (init_file)->data; 3044 char *init_file_name = XSTRING (init_file)->data;