aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-03-02 20:18:09 -0800
committerGlenn Morris2012-03-02 20:18:09 -0800
commit01a6dcc8832ba195ca2c17d5cf04b58f3736902b (patch)
treea34568c7830e66731b8dbd9b6eb24302c71097a9 /src
parent999dd333061ea5d65f6130a6d4357f4782675b8c (diff)
downloademacs-01a6dcc8832ba195ca2c17d5cf04b58f3736902b.tar.gz
emacs-01a6dcc8832ba195ca2c17d5cf04b58f3736902b.zip
lispref/internals.texi Memory Usage tiny change
* doc/lispref/internals.texi: (Memory Usage): Copyedit. * src/alloc.c (misc-objects-consed): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/alloc.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9f1823d34b6..ef57223b9ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
12012-03-03 Glenn Morris <rgm@gnu.org> 12012-03-03 Glenn Morris <rgm@gnu.org>
2 2
3 * alloc.c (Fgarbage_collect): Doc fix. 3 * alloc.c (Fgarbage_collect, misc-objects-consed): Doc fixes.
4 4
52012-03-02 Eli Zaretskii <eliz@gnu.org> 52012-03-02 Eli Zaretskii <eliz@gnu.org>
6 6
diff --git a/src/alloc.c b/src/alloc.c
index 29388870d93..f85661415cd 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6446,7 +6446,9 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */);
6446 doc: /* Number of string characters that have been consed so far. */); 6446 doc: /* Number of string characters that have been consed so far. */);
6447 6447
6448 DEFVAR_INT ("misc-objects-consed", misc_objects_consed, 6448 DEFVAR_INT ("misc-objects-consed", misc_objects_consed,
6449 doc: /* Number of miscellaneous objects that have been consed so far. */); 6449 doc: /* Number of miscellaneous objects that have been consed so far.
6450These include markers and overlays, plus certain objects not visible
6451to users. */);
6450 6452
6451 DEFVAR_INT ("intervals-consed", intervals_consed, 6453 DEFVAR_INT ("intervals-consed", intervals_consed,
6452 doc: /* Number of intervals that have been consed so far. */); 6454 doc: /* Number of intervals that have been consed so far. */);