/[emacs]/emacs/src/lread.c
ViewVC logotype

Diff of /emacs/src/lread.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.262 by raeburn, Tue Oct 16 09:09:51 2001 UTC revision 1.263 by gerd, Tue Oct 23 14:08:08 2001 UTC
# Line 832  Return t if file exists.") Line 832  Return t if file exists.")
832    
833    GCPRO1 (file);    GCPRO1 (file);
834    lispstream = Fcons (Qnil, Qnil);    lispstream = Fcons (Qnil, Qnil);
835    XSETCARFASTINT (lispstream, (EMACS_UINT)stream >> 16);    XSETFASTINT (XCAR (lispstream), (EMACS_UINT)stream >> 16);
836    XSETCDRFASTINT (lispstream, (EMACS_UINT)stream & 0xffff);    XSETFASTINT (XCDR (lispstream), (EMACS_UINT)stream & 0xffff);
837    record_unwind_protect (load_unwind, lispstream);    record_unwind_protect (load_unwind, lispstream);
838    record_unwind_protect (load_descriptor_unwind, load_descriptor_list);    record_unwind_protect (load_descriptor_unwind, load_descriptor_list);
839    specbind (Qload_file_name, found);    specbind (Qload_file_name, found);
# Line 963  openp (path, str, suffixes, storeptr, ex Line 963  openp (path, str, suffixes, storeptr, ex
963    Lisp_Object string, tail;    Lisp_Object string, tail;
964    int max_suffix_len = 0;    int max_suffix_len = 0;
965    
   string = filename = Qnil;  
   GCPRO5 (str, string, filename, path, suffixes);  
     
966    for (tail = suffixes; CONSP (tail); tail = XCDR (tail))    for (tail = suffixes; CONSP (tail); tail = XCDR (tail))
967      {      {
968        string = XCAR (tail);        CHECK_STRING (XCAR (tail), 0);
       CHECK_STRING (string, 0);  
       if (! EQ (string, XCAR (tail)))  
         XSETCAR (tail, string);  
969        max_suffix_len = max (max_suffix_len,        max_suffix_len = max (max_suffix_len,
970                              STRING_BYTES (XSTRING (string)));                              STRING_BYTES (XSTRING (XCAR (tail))));
971      }      }
972    
973      string = filename = Qnil;
974      GCPRO5 (str, string, filename, path, suffixes);
975      
976    if (storeptr)    if (storeptr)
977      *storeptr = Qnil;      *storeptr = Qnil;
978    
# Line 2727  read_list (flag, readcharfun) Line 2724  read_list (flag, readcharfun)
2724              {              {
2725                GCPRO2 (val, tail);                GCPRO2 (val, tail);
2726                if (!NILP (tail))                if (!NILP (tail))
2727                  XSETCDR (tail, read0 (readcharfun));                  XCDR (tail) = read0 (readcharfun);
2728                else                else
2729                  val = read0 (readcharfun);                  val = read0 (readcharfun);
2730                read1 (readcharfun, &ch, 0);                read1 (readcharfun, &ch, 0);
# Line 2820  read_list (flag, readcharfun) Line 2817  read_list (flag, readcharfun)
2817               ? pure_cons (elt, Qnil)               ? pure_cons (elt, Qnil)
2818               : Fcons (elt, Qnil));               : Fcons (elt, Qnil));
2819        if (!NILP (tail))        if (!NILP (tail))
2820          XSETCDR (tail, tem);          XCDR (tail) = tem;
2821        else        else
2822          val = tem;          val = tem;
2823        tail = tem;        tail = tem;
# Line 3656  to load.  See also `load-dangerous-libra Line 3653  to load.  See also `load-dangerous-libra
3653      "Limit for depth of recursive loads.\n\      "Limit for depth of recursive loads.\n\
3654  Value should be either an integer > 0 specifying the limit, or nil for\n\  Value should be either an integer > 0 specifying the limit, or nil for\n\
3655  no limit.");  no limit.");
3656    Vrecursive_load_depth_limit = make_number (10);    Vrecursive_load_depth_limit = make_number (50);
3657    
3658    /* Vsource_directory was initialized in init_lread.  */    /* Vsource_directory was initialized in init_lread.  */
3659    

Legend:
Removed from v.1.262  
changed lines
  Added in v.1.263

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26