Mercurial > emacs

comparison src/alloc.c @ 90533:8a8e69664178

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
90532:e22cf6d2400c 90533:8a8e69664178
557 memory_full (); 557 memory_full ();
558 #endif 558 #endif
559 559
560 /* This used to call error, but if we've run out of memory, we could 560 /* This used to call error, but if we've run out of memory, we could
561 get infinite recursion trying to build the string. */ 561 get infinite recursion trying to build the string. */
562 while (1) 562 xsignal (Qnil, Vmemory_signal_data);
563 Fsignal (Qnil, Vmemory_signal_data);
564 } 563 }
565 564
566 565
567 #ifdef XMALLOC_OVERRUN_CHECK 566 #ifdef XMALLOC_OVERRUN_CHECK
568 567
2775 while (tail) 2774 while (tail)
2776 tail = tail->u.chain; 2775 tail = tail->u.chain;
2777 #endif 2776 #endif
2778 } 2777 }
2779 2778
2780 /* Make a list of 2, 3, 4 or 5 specified objects. */ 2779 /* Make a list of 1, 2, 3, 4 or 5 specified objects. */
2780
2781 Lisp_Object
2782 list1 (arg1)
2783 Lisp_Object arg1;
2784 {
2785 return Fcons (arg1, Qnil);
2786 }
2781 2787
2782 Lisp_Object 2788 Lisp_Object
2783 list2 (arg1, arg2) 2789 list2 (arg1, arg2)
2784 Lisp_Object arg1, arg2; 2790 Lisp_Object arg1, arg2;
2785 { 2791 {
3448 bytes_used_when_full = BYTES_USED; 3454 bytes_used_when_full = BYTES_USED;
3449 #endif 3455 #endif
3450 3456
3451 /* This used to call error, but if we've run out of memory, we could 3457 /* This used to call error, but if we've run out of memory, we could
3452 get infinite recursion trying to build the string. */ 3458 get infinite recursion trying to build the string. */
3453 while (1) 3459 xsignal (Qnil, Vmemory_signal_data);
3454 Fsignal (Qnil, Vmemory_signal_data);
3455 } 3460 }
3456 3461
3457 /* If we released our reserve (due to running out of memory), 3462 /* If we released our reserve (due to running out of memory),
3458 and we have a fair amount free once again, 3463 and we have a fair amount free once again,
3459 try to set aside another reserve in case we run out once more. 3464 try to set aside another reserve in case we run out once more.