Mercurial > emacs
diff src/alloc.c @ 90533:8a8e69664178
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 343-356)
- Update from CVS
- Update for ERC 5.1.3.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 113-115)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 19 Jul 2006 00:42:56 +0000 |
| parents | 65ca8fb66a0d 3254b987edcb |
| children | 858cb33ae39d |
line wrap: on
line diff
--- a/src/alloc.c Fri Jul 14 02:25:53 2006 +0000 +++ b/src/alloc.c Wed Jul 19 00:42:56 2006 +0000 @@ -559,8 +559,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 (Qnil, Vmemory_signal_data); + xsignal (Qnil, Vmemory_signal_data); } @@ -2777,7 +2776,14 @@ #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 list2 (arg1, arg2) @@ -3450,8 +3456,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 (Qnil, Vmemory_signal_data); + xsignal (Qnil, Vmemory_signal_data); } /* If we released our reserve (due to running out of memory),