mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-29 19:48:19 +00:00
(buffer_memory_full, memory_full): Use xsignal. Remove loop.
(list1): New function.
This commit is contained in:
parent
d3f31bc589
commit
9b306d3759
15
src/alloc.c
15
src/alloc.c
@ -559,8 +559,7 @@ buffer_memory_full ()
|
|||||||
|
|
||||||
/* This used to call error, but if we've run out of memory, we could
|
/* This used to call error, but if we've run out of memory, we could
|
||||||
get infinite recursion trying to build the string. */
|
get infinite recursion trying to build the string. */
|
||||||
while (1)
|
xsignal (Qnil, Vmemory_signal_data);
|
||||||
Fsignal (Qnil, Vmemory_signal_data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -2777,7 +2776,14 @@ check_cons_list ()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make a list of 2, 3, 4 or 5 specified objects. */
|
/* Make a list of 1, 2, 3, 4 or 5 specified objects. */
|
||||||
|
|
||||||
|
Lisp_Object
|
||||||
|
list1 (arg1)
|
||||||
|
Lisp_Object arg1;
|
||||||
|
{
|
||||||
|
return Fcons (arg1, Qnil);
|
||||||
|
}
|
||||||
|
|
||||||
Lisp_Object
|
Lisp_Object
|
||||||
list2 (arg1, arg2)
|
list2 (arg1, arg2)
|
||||||
@ -3493,8 +3499,7 @@ memory_full ()
|
|||||||
|
|
||||||
/* This used to call error, but if we've run out of memory, we could
|
/* This used to call error, but if we've run out of memory, we could
|
||||||
get infinite recursion trying to build the string. */
|
get infinite recursion trying to build the string. */
|
||||||
while (1)
|
xsignal (Qnil, Vmemory_signal_data);
|
||||||
Fsignal (Qnil, Vmemory_signal_data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If we released our reserve (due to running out of memory),
|
/* If we released our reserve (due to running out of memory),
|
||||||
|
Loading…
Reference in New Issue
Block a user