aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorMichael Albinus2018-08-27 12:51:44 +0200
committerMichael Albinus2018-08-27 12:51:44 +0200
commitc61fbc529343194923ca11dfe10e9afb8b2546d3 (patch)
tree02ccba7f8c7917a8413d3e5e0a5928ba6a572d0f /src/alloc.c
parente1370c36cef12e4ffdf4519a2eec6bb5b7727883 (diff)
parent1afd313334c93cb5b0a7a378bd635a54dc1d6a9e (diff)
downloademacs-c61fbc529343194923ca11dfe10e9afb8b2546d3.tar.gz
emacs-c61fbc529343194923ca11dfe10e9afb8b2546d3.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c
index cdcd465ac5a..c9788ab4c6b 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -7017,7 +7017,7 @@ Frames, windows, buffers, and subprocesses count as vectors
7017 (but the contents of a buffer's text do not count here). */) 7017 (but the contents of a buffer's text do not count here). */)
7018 (void) 7018 (void)
7019{ 7019{
7020 return listn (CONSTYPE_HEAP, 8, 7020 return listn (CONSTYPE_HEAP, 7,
7021 bounded_number (cons_cells_consed), 7021 bounded_number (cons_cells_consed),
7022 bounded_number (floats_consed), 7022 bounded_number (floats_consed),
7023 bounded_number (vector_cells_consed), 7023 bounded_number (vector_cells_consed),