Mercurial > hg > xemacs-beta

comparison src/lread.c @ 239:41f2f0e326e9 r20-5b18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b18
author cvs
date Mon, 13 Aug 2007 10:15:48 +0200
parents 52952cbfc5b5
children 51092a27c943
comparison
equal deleted inserted replaced
238:b5f2e56b938d 239:41f2f0e326e9
673 #ifdef DOS_NT 673 #ifdef DOS_NT
674 /* The file was opened as binary, because that's what we'll 674 /* The file was opened as binary, because that's what we'll
675 encounter most of the time. If we're loading a .el, we need 675 encounter most of the time. If we're loading a .el, we need
676 to reopen it in text mode. */ 676 to reopen it in text mode. */
677 if (!reading_elc) 677 if (!reading_elc)
678 fd = open (foundstr, O_RDONLY | O_TEXT); 678 {
679 /* #### I would simply call _setmode (fd, O_RDONLY | O_TEXT).
680 This is ok on NT but maybe breaks DOS. Is there
681 any "DOS" still alive? - kkm */
682 close (fd);
683 fd = open (foundstr, O_RDONLY | O_TEXT);
684 if (fd < 0)
685 {
686 if (NILP (no_error))
687 signal_file_error ("Cannot open load file", file);
688 else
689 {
690 UNGCPRO;
691 return Qnil;
692 }
693 }
694 }
679 #endif /* DOS_NT */ 695 #endif /* DOS_NT */
680 } 696 }
681 697
682 #define PRINT_LOADING_MESSAGE(done) do { \ 698 #define PRINT_LOADING_MESSAGE(done) do { \
683 if (load_ignore_elc_files) \ 699 if (load_ignore_elc_files) \
2968 2984
2969 /* further frobbed by startup.el if nil. */ 2985 /* further frobbed by startup.el if nil. */
2970 Vload_path = decode_env_path ("EMACSLOADPATH", normal); 2986 Vload_path = decode_env_path ("EMACSLOADPATH", normal);
2971 2987
2972 /* Vdump_load_path = Qnil; */ 2988 /* Vdump_load_path = Qnil; */
2973 #ifndef CANNOT_DUMP
2974 if (purify_flag && NILP (Vload_path)) 2989 if (purify_flag && NILP (Vload_path))
2975 { 2990 {
2976 /* loadup.el will frob this some more. */ 2991 /* loadup.el will frob this some more. */
2977 /* #### unix-specific */ 2992 /* #### unix-specific */
2978 Vload_path = Fcons (build_string ("../lisp/"), Vload_path); 2993 Vload_path = Fcons (build_string ("../lisp/"), Vload_path);
2979 } 2994 }
2980 #endif /* not CANNOT_DUMP */
2981 load_in_progress = 0; 2995 load_in_progress = 0;
2982 2996
2983 Vload_descriptor_list = Qnil; 2997 Vload_descriptor_list = Qnil;
2984 2998
2985 /* This used to get initialized in init_lread because all streams 2999 /* This used to get initialized in init_lread because all streams