Commit 74d84334 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(memory_full): Pass Qnil to Fsignal for ERROR_SYMBOL.

Fix bugs with inappropriate mixing of Lisp_Object with int.
parent c10f84fb
...@@ -237,7 +237,7 @@ memory_full () ...@@ -237,7 +237,7 @@ memory_full ()
/* This used to call error, but if we've run out of memory, we could get /* This used to call error, but if we've run out of memory, we could get
infinite recursion trying to build the string. */ infinite recursion trying to build the string. */
while (1) while (1)
Fsignal (Qerror, memory_signal_data); Fsignal (Qnil, memory_signal_data);
} }
/* Called if we can't allocate relocatable space for a buffer. */ /* Called if we can't allocate relocatable space for a buffer. */
...@@ -514,7 +514,7 @@ mark_interval_tree (tree) ...@@ -514,7 +514,7 @@ mark_interval_tree (tree)
#define MARK_INTERVAL_TREE(i) \ #define MARK_INTERVAL_TREE(i) \
do { \ do { \
if (!NULL_INTERVAL_P (i) \ if (!NULL_INTERVAL_P (i) \
&& ! XMARKBIT ((Lisp_Object) i->parent)) \ && ! XMARKBIT (*(Lisp_Object *) &i->parent)) \
mark_interval_tree (i); \ mark_interval_tree (i); \
} while (0) } while (0)
...@@ -2264,7 +2264,7 @@ gc_sweep () ...@@ -2264,7 +2264,7 @@ gc_sweep ()
case Lisp_Misc_Free: case Lisp_Misc_Free:
/* If the object was already free, keep it /* If the object was already free, keep it
on the free list. */ on the free list. */
markword = &already_free; markword = (Lisp_Object *) &already_free;
break; break;
default: default:
markword = 0; markword = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment