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

Diff of /emacs/src/fns.c

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

revision 1.311 by rms, Tue Apr 30 17:53:39 2002 UTC revision 1.312 by raeburn, Mon May 20 08:05:43 2002 UTC
# Line 219  Symbols are also allowed; their print na Line 219  Symbols are also allowed; their print na
219       register Lisp_Object s1, s2;       register Lisp_Object s1, s2;
220  {  {
221    if (SYMBOLP (s1))    if (SYMBOLP (s1))
222      XSETSTRING (s1, XSYMBOL (s1)->name);      s1 = SYMBOL_NAME (s1);
223    if (SYMBOLP (s2))    if (SYMBOLP (s2))
224      XSETSTRING (s2, XSYMBOL (s2)->name);      s2 = SYMBOL_NAME (s2);
225    CHECK_STRING (s1);    CHECK_STRING (s1);
226    CHECK_STRING (s2);    CHECK_STRING (s2);
227    
# Line 346  Symbols are also allowed; their print na Line 346  Symbols are also allowed; their print na
346    register int i1, i1_byte, i2, i2_byte;    register int i1, i1_byte, i2, i2_byte;
347    
348    if (SYMBOLP (s1))    if (SYMBOLP (s1))
349      XSETSTRING (s1, XSYMBOL (s1)->name);      s1 = SYMBOL_NAME (s1);
350    if (SYMBOLP (s2))    if (SYMBOLP (s2))
351      XSETSTRING (s2, XSYMBOL (s2)->name);      s2 = SYMBOL_NAME (s2);
352    CHECK_STRING (s1);    CHECK_STRING (s1);
353    CHECK_STRING (s2);    CHECK_STRING (s2);
354    
# Line 3255  The normal messages at start and end of Line 3255  The normal messages at start and end of
3255           of what files are preloaded and when.  */           of what files are preloaded and when.  */
3256        if (! NILP (Vpurify_flag))        if (! NILP (Vpurify_flag))
3257          error ("(require %s) while preparing to dump",          error ("(require %s) while preparing to dump",
3258                 XSYMBOL (feature)->name->data);                 XSTRING (SYMBOL_NAME (feature))->data);
3259                
3260        /* A certain amount of recursive `require' is legitimate,        /* A certain amount of recursive `require' is legitimate,
3261           but if we require the same feature recursively 3 times,           but if we require the same feature recursively 3 times,
# Line 3269  The normal messages at start and end of Line 3269  The normal messages at start and end of
3269          }          }
3270        if (nesting > 2)        if (nesting > 2)
3271          error ("Recursive `require' for feature `%s'",          error ("Recursive `require' for feature `%s'",
3272                 XSYMBOL (feature)->name->data);                 XSTRING (SYMBOL_NAME (feature))->data);
3273    
3274        /* Update the list for any nested `require's that occur.  */        /* Update the list for any nested `require's that occur.  */
3275        record_unwind_protect (require_unwind, require_nesting_list);        record_unwind_protect (require_unwind, require_nesting_list);
# Line 3292  The normal messages at start and end of Line 3292  The normal messages at start and end of
3292        tem = Fmemq (feature, Vfeatures);        tem = Fmemq (feature, Vfeatures);
3293        if (NILP (tem))        if (NILP (tem))
3294          error ("Required feature `%s' was not provided",          error ("Required feature `%s' was not provided",
3295                 XSYMBOL (feature)->name->data);                 XSTRING (SYMBOL_NAME (feature))->data);
3296    
3297        /* Once loading finishes, don't undo it.  */        /* Once loading finishes, don't undo it.  */
3298        Vautoload_queue = Qt;        Vautoload_queue = Qt;
# Line 4796  sxhash (obj, depth) Line 4796  sxhash (obj, depth)
4796        break;        break;
4797    
4798      case Lisp_Symbol:      case Lisp_Symbol:
4799        hash = sxhash_string (XSYMBOL (obj)->name->data,        hash = sxhash_string (XSTRING (SYMBOL_NAME (obj))->data,
4800                              XSYMBOL (obj)->name->size);                              XSTRING (SYMBOL_NAME (obj))->size);
4801        break;        break;
4802    
4803      case Lisp_Misc:      case Lisp_Misc:

Legend:
Removed from v.1.311  
changed lines
  Added in v.1.312

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