comparison src/lread.c @ 231:557eaa0339bf r20-5b14

Import from CVS: tag r20-5b14
author cvs
date Mon, 13 Aug 2007 10:13:48 +0200
parents 434959a2fba3
children 52952cbfc5b5
comparison
equal deleted inserted replaced
230:39ed1d2bdd9d 231:557eaa0339bf
634 newer = Ffile_name_nondirectory (found); 634 newer = Ffile_name_nondirectory (found);
635 } 635 }
636 else if (load_warn_when_source_newer && 636 else if (load_warn_when_source_newer &&
637 !memcmp (".elc", foundstr + foundlen - 4, 4)) 637 !memcmp (".elc", foundstr + foundlen - 4, 4))
638 { 638 {
639 /* struct stat s1, s2;*/
640 if (! fstat (fd, &s1)) /* can't fail, right? */ 639 if (! fstat (fd, &s1)) /* can't fail, right? */
641 { 640 {
642 int result; 641 int result;
643 /* temporarily hack the 'c' off the end of the filename */ 642 /* temporarily hack the 'c' off the end of the filename */
644 foundstr[foundlen - 1] = '\0'; 643 foundstr[foundlen - 1] = '\0';
2979 #endif /* not CANNOT_DUMP */ 2978 #endif /* not CANNOT_DUMP */
2980 load_in_progress = 0; 2979 load_in_progress = 0;
2981 2980
2982 Vload_descriptor_list = Qnil; 2981 Vload_descriptor_list = Qnil;
2983 2982
2984 Vread_buffer_stream = make_resizing_buffer_output_stream (); 2983 /* This used to get initialized in init_lread because all streams
2984 got closed when dumping occurs. This is no longer true --
2985 Vread_buffer_stream is a resizing output stream, and there is no
2986 reason to close it at dump-time.
2987
2988 Vread_buffer_stream is set to Qnil in vars_of_lread, and this
2989 will initialize it only once, at dump-time. */
2990 if (NILP (Vread_buffer_stream))
2991 Vread_buffer_stream = make_resizing_buffer_output_stream ();
2985 2992
2986 Vload_force_doc_string_list = Qnil; 2993 Vload_force_doc_string_list = Qnil;
2987 } 2994 }
2988 2995
2989 void 2996 void
3141 3148
3142 /* This must be initialized in init_lread otherwise it may start out 3149 /* This must be initialized in init_lread otherwise it may start out
3143 with values saved when the image is dumped. */ 3150 with values saved when the image is dumped. */
3144 staticpro (&Vload_descriptor_list); 3151 staticpro (&Vload_descriptor_list);
3145 3152
3146 /* This gets initialized in init_lread because all streams get closed 3153 Vread_buffer_stream = Qnil;
3147 when dumping occurs */
3148 staticpro (&Vread_buffer_stream); 3154 staticpro (&Vread_buffer_stream);
3149 3155
3150 /* Initialized in init_lread. */ 3156 /* Initialized in init_lread. */
3151 staticpro (&Vload_force_doc_string_list); 3157 staticpro (&Vload_force_doc_string_list);
3152 3158
3167 #ifdef FEATUREP_SYNTAX 3173 #ifdef FEATUREP_SYNTAX
3168 defsymbol (&Qfeaturep, "featurep"); 3174 defsymbol (&Qfeaturep, "featurep");
3169 Fprovide(intern("xemacs")); 3175 Fprovide(intern("xemacs"));
3170 #ifdef INFODOCK 3176 #ifdef INFODOCK
3171 Fprovide(intern("infodock")); 3177 Fprovide(intern("infodock"));
3172 #endif 3178 #endif /* INFODOCK */
3173 #endif 3179 #endif /* FEATUREP_SYNTAX */
3174 3180
3175 #ifdef LISP_BACKQUOTES 3181 #ifdef LISP_BACKQUOTES
3176 old_backquote_flag = new_backquote_flag = 0; 3182 old_backquote_flag = new_backquote_flag = 0;
3177 #endif 3183 #endif
3178 3184