[Emacs-diffs] /srv/bzr/emacs/trunk r107490: lispref/internals.texi Memory Usage tiny change

[Glenn Morris]

------------------------------------------------------------
revno: 107490
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-03-02 20:18:09 -0800
message:
  lispref/internals.texi Memory Usage tiny change
  
  * doc/lispref/internals.texi: (Memory Usage): Copyedit.
  
  * src/alloc.c (misc-objects-consed): Doc fix.
modified:
  doc/lispref/ChangeLog
  doc/lispref/internals.texi
  src/ChangeLog
  src/alloc.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-03-03 03:59:22 +0000
+++ b/doc/lispref/ChangeLog     2012-03-03 04:18:09 +0000
@@ -4,6 +4,7 @@
        (Building Emacs): Say less about CANNOT_DUMP platforms.
        Replace deleted eval-at-startup with custom-initialize-delay.
        (Pure Storage): Small changes.
+       (Memory Usage): Copyedit.
 
        * tips.texi: Copyedits.
        (Coding Conventions): Mention autoloads.

=== modified file 'doc/lispref/internals.texi'
--- a/doc/lispref/internals.texi        2012-03-03 03:59:22 +0000
+++ b/doc/lispref/internals.texi        2012-03-03 04:18:09 +0000
@@ -456,7 +456,7 @@
   These functions and variables give information about the total amount
 of memory allocation that Emacs has done, broken down by data type.
 Note the difference between these and the values returned by
address@hidden(garbage-collect)}; those count objects that currently exist, but
address@hidden; those count objects that currently exist, but
 these count the number or size of all allocations, including those for
 objects that have since been freed.
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-03 03:59:22 +0000
+++ b/src/ChangeLog     2012-03-03 04:18:09 +0000
@@ -1,6 +1,6 @@
 2012-03-03  Glenn Morris  <address@hidden>
 
-       * alloc.c (Fgarbage_collect): Doc fix.
+       * alloc.c (Fgarbage_collect, misc-objects-consed): Doc fixes.
 
 2012-03-02  Eli Zaretskii  <address@hidden>
 

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2012-03-03 03:59:22 +0000
+++ b/src/alloc.c       2012-03-03 04:18:09 +0000
@@ -6446,7 +6446,9 @@
              doc: /* Number of string characters that have been consed so far. 
 */);
 
   DEFVAR_INT ("misc-objects-consed", misc_objects_consed,
-             doc: /* Number of miscellaneous objects that have been consed so 
far.  */);
+             doc: /* Number of miscellaneous objects that have been consed so 
far.
+These include markers and overlays, plus certain objects not visible
+to users.  */);
 
   DEFVAR_INT ("intervals-consed", intervals_consed,
              doc: /* Number of intervals that have been consed so far.  */);