aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorPaul Eggert2011-12-14 02:51:30 -0800
committerPaul Eggert2011-12-14 02:51:30 -0800
commit59815c02506eb39b61e672528ed03885749ba529 (patch)
tree08770ed78fae3dc1a0996250d61e127ebfd135fd /src/alloc.c
parent8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (diff)
parent898169a2d88c3538cdfd41feb0b16267165065bd (diff)
downloademacs-59815c02506eb39b61e672528ed03885749ba529.tar.gz
emacs-59815c02506eb39b61e672528ed03885749ba529.zip
Merge from trunk.
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 84a84df3597..05b681cdafb 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6400,7 +6400,7 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */);
6400 Vgc_cons_percentage = make_float (0.1); 6400 Vgc_cons_percentage = make_float (0.1);
6401 6401
6402 DEFVAR_INT ("pure-bytes-used", pure_bytes_used, 6402 DEFVAR_INT ("pure-bytes-used", pure_bytes_used,
6403 doc: /* Number of bytes of sharable Lisp data allocated so far. */); 6403 doc: /* Number of bytes of shareable Lisp data allocated so far. */);
6404 6404
6405 DEFVAR_INT ("cons-cells-consed", cons_cells_consed, 6405 DEFVAR_INT ("cons-cells-consed", cons_cells_consed,
6406 doc: /* Number of cons cells that have been consed so far. */); 6406 doc: /* Number of cons cells that have been consed so far. */);