Mercurial > emacs
changeset 18621:53b95f307c75
(memory_full): Pass Qnil to Fsignal for ERROR_SYMBOL.
Fix bugs with inappropriate mixing of Lisp_Object with int.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 05 Jul 1997 00:22:54 +0000 |
| parents | ea924276b44b |
| children | fe2070df967e |
| files | src/alloc.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/alloc.c Sat Jul 05 00:20:22 1997 +0000 +++ b/src/alloc.c Sat Jul 05 00:22:54 1997 +0000 @@ -237,7 +237,7 @@ /* This used to call error, but if we've run out of memory, we could get infinite recursion trying to build the string. */ while (1) - Fsignal (Qerror, memory_signal_data); + Fsignal (Qnil, memory_signal_data); } /* Called if we can't allocate relocatable space for a buffer. */ @@ -514,7 +514,7 @@ #define MARK_INTERVAL_TREE(i) \ do { \ if (!NULL_INTERVAL_P (i) \ - && ! XMARKBIT ((Lisp_Object) i->parent)) \ + && ! XMARKBIT (*(Lisp_Object *) &i->parent)) \ mark_interval_tree (i); \ } while (0) @@ -2264,7 +2264,7 @@ case Lisp_Misc_Free: /* If the object was already free, keep it on the free list. */ - markword = &already_free; + markword = (Lisp_Object *) &already_free; break; default: markword = 0;