diff options
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/alloc.c b/src/alloc.c index c7936921a09..27426cdff66 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -2813,7 +2813,7 @@ list5 (Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4, L | |||
| 2813 | 2813 | ||
| 2814 | /* Make a list of COUNT Lisp_Objects, where ARG is the | 2814 | /* Make a list of COUNT Lisp_Objects, where ARG is the |
| 2815 | first one. Allocate conses from pure space if TYPE | 2815 | first one. Allocate conses from pure space if TYPE |
| 2816 | is PURE, or allocate as usual if type is HEAP. */ | 2816 | is CONSTYPE_PURE, or allocate as usual if type is CONSTYPE_HEAP. */ |
| 2817 | 2817 | ||
| 2818 | Lisp_Object | 2818 | Lisp_Object |
| 2819 | listn (enum constype type, ptrdiff_t count, Lisp_Object arg, ...) | 2819 | listn (enum constype type, ptrdiff_t count, Lisp_Object arg, ...) |
| @@ -2834,9 +2834,9 @@ listn (enum constype type, ptrdiff_t count, Lisp_Object arg, ...) | |||
| 2834 | 2834 | ||
| 2835 | for (i = 0, val = Qnil; i < count; i++) | 2835 | for (i = 0, val = Qnil; i < count; i++) |
| 2836 | { | 2836 | { |
| 2837 | if (type == PURE) | 2837 | if (type == CONSTYPE_PURE) |
| 2838 | val = pure_cons (objp[i], val); | 2838 | val = pure_cons (objp[i], val); |
| 2839 | else if (type == HEAP) | 2839 | else if (type == CONSTYPE_HEAP) |
| 2840 | val = Fcons (objp[i], val); | 2840 | val = Fcons (objp[i], val); |
| 2841 | else | 2841 | else |
| 2842 | abort (); | 2842 | abort (); |
| @@ -6676,7 +6676,7 @@ Frames, windows, buffers, and subprocesses count as vectors | |||
| 6676 | (but the contents of a buffer's text do not count here). */) | 6676 | (but the contents of a buffer's text do not count here). */) |
| 6677 | (void) | 6677 | (void) |
| 6678 | { | 6678 | { |
| 6679 | return listn (HEAP, 8, | 6679 | return listn (CONSTYPE_HEAP, 8, |
| 6680 | bounded_number (cons_cells_consed), | 6680 | bounded_number (cons_cells_consed), |
| 6681 | bounded_number (floats_consed), | 6681 | bounded_number (floats_consed), |
| 6682 | bounded_number (vector_cells_consed), | 6682 | bounded_number (vector_cells_consed), |
| @@ -6865,7 +6865,7 @@ do hash-consing of the objects allocated to pure space. */); | |||
| 6865 | /* We build this in advance because if we wait until we need it, we might | 6865 | /* We build this in advance because if we wait until we need it, we might |
| 6866 | not be able to allocate the memory to hold it. */ | 6866 | not be able to allocate the memory to hold it. */ |
| 6867 | Vmemory_signal_data | 6867 | Vmemory_signal_data |
| 6868 | = listn (PURE, 2, Qerror, | 6868 | = listn (CONSTYPE_PURE, 2, Qerror, |
| 6869 | build_pure_c_string ("Memory exhausted--use M-x save-some-buffers then exit and restart Emacs")); | 6869 | build_pure_c_string ("Memory exhausted--use M-x save-some-buffers then exit and restart Emacs")); |
| 6870 | 6870 | ||
| 6871 | DEFVAR_LISP ("memory-full", Vmemory_full, | 6871 | DEFVAR_LISP ("memory-full", Vmemory_full, |