Mercurial > hg > xemacs-beta
diff src/alloc.c @ 5471:00e79bbbe48f
Merge with trunk.
author | Mats Lidell <matsl@xemacs.org> |
---|---|
date | Mon, 14 Feb 2011 22:43:46 +0100 |
parents | 8d29f1c4bb98 22c4e67a2e69 |
children | 4dee0387b9de |
line wrap: on
line diff
--- a/src/alloc.c Mon Feb 07 21:22:17 2011 +0100 +++ b/src/alloc.c Mon Feb 14 22:43:46 2011 +0100 @@ -1426,8 +1426,10 @@ return Fcons (obj0, Fcons (obj1, obj2)); } -Lisp_Object -acons (Lisp_Object key, Lisp_Object value, Lisp_Object alist) +DEFUN ("acons", Facons, 3, 3, 0, /* +Return a new alist created by prepending (KEY . VALUE) to ALIST. +*/ + (key, value, alist)) { return Fcons (Fcons (key, value), alist); } @@ -4195,10 +4197,10 @@ xzero (object_stats); lisp_object_storage_size (object, &object_stats); - val = acons (Qobject_actually_requested, - make_int (object_stats.was_requested), val); - val = acons (Qobject_malloc_overhead, - make_int (object_stats.malloc_overhead), val); + val = Facons (Qobject_actually_requested, + make_int (object_stats.was_requested), val); + val = Facons (Qobject_malloc_overhead, + make_int (object_stats.malloc_overhead), val); assert (!object_stats.dynarr_overhead); assert (!object_stats.gap_overhead); @@ -4208,16 +4210,16 @@ MAYBE_OBJECT_METH (object, memory_usage, (object, &gustats)); val = Fcons (Qt, val); - val = acons (Qother_memory_actually_requested, - make_int (gustats.u.was_requested), val); - val = acons (Qother_memory_malloc_overhead, - make_int (gustats.u.malloc_overhead), val); + val = Facons (Qother_memory_actually_requested, + make_int (gustats.u.was_requested), val); + val = Facons (Qother_memory_malloc_overhead, + make_int (gustats.u.malloc_overhead), val); if (gustats.u.dynarr_overhead) - val = acons (Qother_memory_dynarr_overhead, - make_int (gustats.u.dynarr_overhead), val); + val = Facons (Qother_memory_dynarr_overhead, + make_int (gustats.u.dynarr_overhead), val); if (gustats.u.gap_overhead) - val = acons (Qother_memory_gap_overhead, - make_int (gustats.u.gap_overhead), val); + val = Facons (Qother_memory_gap_overhead, + make_int (gustats.u.gap_overhead), val); val = Fcons (Qnil, val); i = 0; @@ -4228,7 +4230,7 @@ val = Fcons (item, val); else { - val = acons (item, make_int (gustats.othervals[i]), val); + val = Facons (item, make_int (gustats.othervals[i]), val); i++; } } @@ -5699,6 +5701,7 @@ DEFSUBR (Fcons); DEFSUBR (Flist); + DEFSUBR (Facons); DEFSUBR (Fvector); DEFSUBR (Fbit_vector); DEFSUBR (Fmake_byte_code);