xemacs-beta: src/lread.c comparison

Import from CVS: tag r20-3b24

comparison

equal deleted inserted replaced

-:2947057885e5
+:a2f645c6b9f8
 	}
 hashtab = locate_file_find_directory_hash_table (pathel);
 /* Loop over suffixes.  */
-for (tail = suffixtab, found = 0; !NILP (tail) && !found;
+for (tail = suffixtab, found = 0; !found && CONSP (tail);
-	   tail = Fcdr (tail))
+	   tail = XCDR (tail))
 	{
-	  if (!NILP (Fgethash (Fcar (tail), hashtab, Qnil)))
+	  if (!NILP (Fgethash (XCAR (tail), hashtab, Qnil)))
 	    found = 1;
 	}
 if (found)
 	{
 while (!NILP (tail))
 {
 tem = Fcar (tail);
 /* Find the feature's previous assoc list... */
-if (!NILP (Fequal (source, Fcar (tem))))
+if (internal_equal (source, Fcar (tem), 0))
 	{
 	  foundit = 1;
 	  /*  If we're loading, remove it. */
 	  if (loading)
 	    {
 	      tem2 = Vcurrent_load_list;
 	      while (CONSP (tem2))
 		{
-		  newelt = Fcar (tem2);
+		  newelt = XCAR (tem2);
 		  if (NILP (Fmemq (newelt, tem)))
 		    Fsetcar (tail, Fcons (Fcar (tem),
 					  Fcons (newelt, Fcdr (tem))));
-		  tem2 = Fcdr (tem2);
+		  tem2 = XCDR (tem2);
 		  QUIT;
 		}
 	    }
 	}
 else

Mercurial > hg > xemacs-beta