[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fns.c
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] Changes to emacs/src/fns.c |
Date: |
Mon, 20 May 2002 04:05:43 -0400 |
Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.311 emacs/src/fns.c:1.312
*** emacs/src/fns.c:1.311 Tue Apr 30 13:53:39 2002
--- emacs/src/fns.c Mon May 20 04:05:43 2002
***************
*** 219,227 ****
register Lisp_Object s1, s2;
{
if (SYMBOLP (s1))
! XSETSTRING (s1, XSYMBOL (s1)->name);
if (SYMBOLP (s2))
! XSETSTRING (s2, XSYMBOL (s2)->name);
CHECK_STRING (s1);
CHECK_STRING (s2);
--- 219,227 ----
register Lisp_Object s1, s2;
{
if (SYMBOLP (s1))
! s1 = SYMBOL_NAME (s1);
if (SYMBOLP (s2))
! s2 = SYMBOL_NAME (s2);
CHECK_STRING (s1);
CHECK_STRING (s2);
***************
*** 346,354 ****
register int i1, i1_byte, i2, i2_byte;
if (SYMBOLP (s1))
! XSETSTRING (s1, XSYMBOL (s1)->name);
if (SYMBOLP (s2))
! XSETSTRING (s2, XSYMBOL (s2)->name);
CHECK_STRING (s1);
CHECK_STRING (s2);
--- 346,354 ----
register int i1, i1_byte, i2, i2_byte;
if (SYMBOLP (s1))
! s1 = SYMBOL_NAME (s1);
if (SYMBOLP (s2))
! s2 = SYMBOL_NAME (s2);
CHECK_STRING (s1);
CHECK_STRING (s2);
***************
*** 3255,3261 ****
of what files are preloaded and when. */
if (! NILP (Vpurify_flag))
error ("(require %s) while preparing to dump",
! XSYMBOL (feature)->name->data);
/* A certain amount of recursive `require' is legitimate,
but if we require the same feature recursively 3 times,
--- 3255,3261 ----
of what files are preloaded and when. */
if (! NILP (Vpurify_flag))
error ("(require %s) while preparing to dump",
! XSTRING (SYMBOL_NAME (feature))->data);
/* A certain amount of recursive `require' is legitimate,
but if we require the same feature recursively 3 times,
***************
*** 3269,3275 ****
}
if (nesting > 2)
error ("Recursive `require' for feature `%s'",
! XSYMBOL (feature)->name->data);
/* Update the list for any nested `require's that occur. */
record_unwind_protect (require_unwind, require_nesting_list);
--- 3269,3275 ----
}
if (nesting > 2)
error ("Recursive `require' for feature `%s'",
! XSTRING (SYMBOL_NAME (feature))->data);
/* Update the list for any nested `require's that occur. */
record_unwind_protect (require_unwind, require_nesting_list);
***************
*** 3292,3298 ****
tem = Fmemq (feature, Vfeatures);
if (NILP (tem))
error ("Required feature `%s' was not provided",
! XSYMBOL (feature)->name->data);
/* Once loading finishes, don't undo it. */
Vautoload_queue = Qt;
--- 3292,3298 ----
tem = Fmemq (feature, Vfeatures);
if (NILP (tem))
error ("Required feature `%s' was not provided",
! XSTRING (SYMBOL_NAME (feature))->data);
/* Once loading finishes, don't undo it. */
Vautoload_queue = Qt;
***************
*** 4796,4803 ****
break;
case Lisp_Symbol:
! hash = sxhash_string (XSYMBOL (obj)->name->data,
! XSYMBOL (obj)->name->size);
break;
case Lisp_Misc:
--- 4796,4803 ----
break;
case Lisp_Symbol:
! hash = sxhash_string (XSTRING (SYMBOL_NAME (obj))->data,
! XSTRING (SYMBOL_NAME (obj))->size);
break;
case Lisp_Misc:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/fns.c,
Ken Raeburn <=