diff options
| author | Glenn Morris | 2012-03-02 20:18:09 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-03-02 20:18:09 -0800 |
| commit | 01a6dcc8832ba195ca2c17d5cf04b58f3736902b (patch) | |
| tree | a34568c7830e66731b8dbd9b6eb24302c71097a9 | |
| parent | 999dd333061ea5d65f6130a6d4357f4782675b8c (diff) | |
| download | emacs-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.
| -rw-r--r-- | doc/lispref/ChangeLog | 1 | ||||
| -rw-r--r-- | doc/lispref/internals.texi | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/alloc.c | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 47705612146..cad2921e78c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | (Building Emacs): Say less about CANNOT_DUMP platforms. | 4 | (Building Emacs): Say less about CANNOT_DUMP platforms. |
| 5 | Replace deleted eval-at-startup with custom-initialize-delay. | 5 | Replace deleted eval-at-startup with custom-initialize-delay. |
| 6 | (Pure Storage): Small changes. | 6 | (Pure Storage): Small changes. |
| 7 | (Memory Usage): Copyedit. | ||
| 7 | 8 | ||
| 8 | * tips.texi: Copyedits. | 9 | * tips.texi: Copyedits. |
| 9 | (Coding Conventions): Mention autoloads. | 10 | (Coding Conventions): Mention autoloads. |
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 35759d39f1d..bab96582302 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi | |||
| @@ -456,7 +456,7 @@ point number. | |||
| 456 | These functions and variables give information about the total amount | 456 | These functions and variables give information about the total amount |
| 457 | of memory allocation that Emacs has done, broken down by data type. | 457 | of memory allocation that Emacs has done, broken down by data type. |
| 458 | Note the difference between these and the values returned by | 458 | Note the difference between these and the values returned by |
| 459 | @code{(garbage-collect)}; those count objects that currently exist, but | 459 | @code{garbage-collect}; those count objects that currently exist, but |
| 460 | these count the number or size of all allocations, including those for | 460 | these count the number or size of all allocations, including those for |
| 461 | objects that have since been freed. | 461 | objects that have since been freed. |
| 462 | 462 | ||
diff --git a/src/ChangeLog b/src/ChangeLog index 9f1823d34b6..ef57223b9ca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 2012-03-03 Glenn Morris <rgm@gnu.org> | 1 | 2012-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 | ||
| 5 | 2012-03-02 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-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. |
| 6450 | These include markers and overlays, plus certain objects not visible | ||
| 6451 | to 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. */); |