changeset 40211:19a89ce104dd

(syms_of_lread)<recursive-load-depth-limit>: Raise to 50.
author Gerd Moellmann <gerd@gnu.org>
date Tue, 23 Oct 2001 14:08:08 +0000
parents 01666fd1b210
children 9929e04e78bb
files src/lread.c
diffstat 1 files changed, 12 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/lread.c	Tue Oct 23 13:52:45 2001 +0000
+++ b/src/lread.c	Tue Oct 23 14:08:08 2001 +0000
@@ -832,8 +832,8 @@
 
   GCPRO1 (file);
   lispstream = Fcons (Qnil, Qnil);
-  XSETCARFASTINT (lispstream, (EMACS_UINT)stream >> 16);
-  XSETCDRFASTINT (lispstream, (EMACS_UINT)stream & 0xffff);
+  XSETFASTINT (XCAR (lispstream), (EMACS_UINT)stream >> 16);
+  XSETFASTINT (XCDR (lispstream), (EMACS_UINT)stream & 0xffff);
   record_unwind_protect (load_unwind, lispstream);
   record_unwind_protect (load_descriptor_unwind, load_descriptor_list);
   specbind (Qload_file_name, found);
@@ -963,19 +963,16 @@
   Lisp_Object string, tail;
   int max_suffix_len = 0;
 
+  for (tail = suffixes; CONSP (tail); tail = XCDR (tail))
+    {
+      CHECK_STRING (XCAR (tail), 0);
+      max_suffix_len = max (max_suffix_len,
+			    STRING_BYTES (XSTRING (XCAR (tail))));
+    }
+
   string = filename = Qnil;
   GCPRO5 (str, string, filename, path, suffixes);
   
-  for (tail = suffixes; CONSP (tail); tail = XCDR (tail))
-    {
-      string = XCAR (tail);
-      CHECK_STRING (string, 0);
-      if (! EQ (string, XCAR (tail)))
-	XSETCAR (tail, string);
-      max_suffix_len = max (max_suffix_len,
-			    STRING_BYTES (XSTRING (string)));
-    }
-
   if (storeptr)
     *storeptr = Qnil;
 
@@ -2727,7 +2724,7 @@
 	    {
 	      GCPRO2 (val, tail);
 	      if (!NILP (tail))
-		XSETCDR (tail, read0 (readcharfun));
+		XCDR (tail) = read0 (readcharfun);
 	      else
 		val = read0 (readcharfun);
 	      read1 (readcharfun, &ch, 0);
@@ -2820,7 +2817,7 @@
 	     ? pure_cons (elt, Qnil)
 	     : Fcons (elt, Qnil));
       if (!NILP (tail))
-	XSETCDR (tail, tem);
+	XCDR (tail) = tem;
       else
 	val = tem;
       tail = tem;
@@ -3656,7 +3653,7 @@
     "Limit for depth of recursive loads.\n\
 Value should be either an integer > 0 specifying the limit, or nil for\n\
 no limit.");
-  Vrecursive_load_depth_limit = make_number (10);
+  Vrecursive_load_depth_limit = make_number (50);
 
   /* Vsource_directory was initialized in init_lread.  */