comparison src/lread.c @ 181:bfd6434d15b3 r20-3b17

Import from CVS: tag r20-3b17
author cvs
date Mon, 13 Aug 2007 09:53:19 +0200
parents 8eaf7971accc
children 3d6bfa290dbd
comparison
equal deleted inserted replaced
180:add28d59e586 181:bfd6434d15b3
1172 -- addition and deletion of non-shadowing files (see below) from the 1172 -- addition and deletion of non-shadowing files (see below) from the
1173 directories in the list. 1173 directories in the list.
1174 -- byte-compilation of a .el file into a .elc file. 1174 -- byte-compilation of a .el file into a .elc file.
1175 1175
1176 `locate-file' will primarily get confused if you add a file that shadows 1176 `locate-file' will primarily get confused if you add a file that shadows
1177 (i.e. has the same name as) another file further down in the directory list. 1177 \(i.e. has the same name as) another file further down in the directory list.
1178 In this case, you must call `locate-file-clear-hashing'. 1178 In this case, you must call `locate-file-clear-hashing'.
1179 */ 1179 */
1180 (path)) 1180 (path))
1181 { 1181 {
1182 Lisp_Object pathtail; 1182 Lisp_Object pathtail;
1183 1183
1184 for (pathtail = path; !NILP (pathtail); pathtail = Fcdr (pathtail)) 1184 for (pathtail = path; !NILP (pathtail); pathtail = Fcdr (pathtail))
1185 { 1185 {
2729 s.length = 0; 2729 s.length = 0;
2730 s.allow_dotted_lists = allow_dotted_lists; 2730 s.allow_dotted_lists = allow_dotted_lists;
2731 s.terminator = terminator; 2731 s.terminator = terminator;
2732 GCPRO2 (s.head, s.tail); 2732 GCPRO2 (s.head, s.tail);
2733 2733
2734 (void) sequence_reader (readcharfun, 2734 sequence_reader (readcharfun, terminator, &s, read_list_conser);
2735 terminator,
2736 &s,
2737 read_list_conser);
2738 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK 2735 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
2739 Vcurrent_compiled_function_annotation = old_compiled_function_annotation; 2736 Vcurrent_compiled_function_annotation = old_compiled_function_annotation;
2740 #endif 2737 #endif
2741 2738
2742 if ((purify_flag || load_force_doc_strings) && check_for_doc_references) 2739 if ((purify_flag || load_force_doc_strings) && check_for_doc_references)
2817 int len; 2814 int len;
2818 int i; 2815 int i;
2819 struct read_list_state s; 2816 struct read_list_state s;
2820 struct gcpro gcpro1, gcpro2; 2817 struct gcpro gcpro1, gcpro2;
2821 2818
2822
2823 s.head = Qnil; 2819 s.head = Qnil;
2824 s.tail = Qnil; 2820 s.tail = Qnil;
2825 s.length = 0; 2821 s.length = 0;
2826 s.allow_dotted_lists = 0; 2822 s.allow_dotted_lists = 0;
2827 GCPRO2 (s.head, s.tail); 2823 GCPRO2 (s.head, s.tail);
2828 2824
2829 (void) sequence_reader (readcharfun, 2825 sequence_reader (readcharfun, terminator, &s, read_list_conser);
2830 terminator, 2826
2831 &s,
2832 read_list_conser);
2833 UNGCPRO; 2827 UNGCPRO;
2834 tem = s.head; 2828 tem = s.head;
2835 len = XINT (Flength (tem)); 2829 len = XINT (Flength (tem));
2836 2830
2837 #if 0 /* FSFmacs defun hack */ 2831 #if 0 /* FSFmacs defun hack */