comparison src/lread.c @ 5027:22179cd0fe15

merge
author Ben Wing <ben@xemacs.org>
date Wed, 10 Feb 2010 07:25:19 -0600
parents 2ade80e8c640
children 207dad9e74f7
comparison
equal deleted inserted replaced
5026:46cf825f6158 5027:22179cd0fe15
354 len -= 4; 354 len -= 4;
355 else if (len >= 3 && !qxestrcmp_ascii (nonreloc + len - 3, ".el")) 355 else if (len >= 3 && !qxestrcmp_ascii (nonreloc + len - 3, ".el"))
356 len -= 3; 356 len -= 3;
357 357
358 { 358 {
359 EXTERNAL_LIST_LOOP_2 (acons, Vload_suppress_alist) 359 EXTERNAL_LIST_LOOP_2 (cons, Vload_suppress_alist)
360 { 360 {
361 if (CONSP (acons) && STRINGP (XCAR (acons))) 361 if (CONSP (cons) && STRINGP (XCAR (cons)))
362 { 362 {
363 Lisp_Object name = XCAR (acons); 363 Lisp_Object name = XCAR (cons);
364 if (XSTRING_LENGTH (name) == len && 364 if (XSTRING_LENGTH (name) == len &&
365 !memcmp (XSTRING_DATA (name), nonreloc, len)) 365 !memcmp (XSTRING_DATA (name), nonreloc, len))
366 { 366 {
367 struct gcpro gcpro1; 367 struct gcpro gcpro1;
368 Lisp_Object val; 368 Lisp_Object val;
369 369
370 GCPRO1 (reloc); 370 GCPRO1 (reloc);
371 val = IGNORE_MULTIPLE_VALUES (Feval (XCDR (acons))); 371 val = IGNORE_MULTIPLE_VALUES (Feval (XCDR (cons)));
372 UNGCPRO; 372 UNGCPRO;
373 373
374 if (!NILP (val)) 374 if (!NILP (val))
375 return 1; 375 return 1;
376 } 376 }
377 } 377 }
378 } 378 }
379 } 379 }
380 380