aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/internals.texi13
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 49fda5d5d32..5bb5d6101e4 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
12012-05-05 Glenn Morris <rgm@gnu.org> 12012-05-05 Glenn Morris <rgm@gnu.org>
2 2
3 * internals.texi (Garbage Collection, Memory Usage)
4 (Writing Emacs Primitives): Tweak page breaks.
5
3 * streams.texi (Output Variables): Improve page break. 6 * streams.texi (Output Variables): Improve page break.
4 7
5 * edebug.texi (Edebug Display Update): Improve page break. 8 * edebug.texi (Edebug Display Update): Improve page break.
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index edf892e751a..301aa0b23be 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -355,7 +355,7 @@ itself; the latter is only allocated when the string is created.)
355 355
356If there was overflow in pure space (@pxref{Pure Storage}), 356If there was overflow in pure space (@pxref{Pure Storage}),
357@code{garbage-collect} returns @code{nil}, because a real garbage 357@code{garbage-collect} returns @code{nil}, because a real garbage
358collection can not be done in this situation. 358collection cannot be done.
359@end deffn 359@end deffn
360 360
361@defopt garbage-collection-messages 361@defopt garbage-collection-messages
@@ -472,12 +472,12 @@ in this Emacs session.
472 472
473@defvar string-chars-consed 473@defvar string-chars-consed
474The total number of string characters that have been allocated so far 474The total number of string characters that have been allocated so far
475in this Emacs session. 475in this session.
476@end defvar 476@end defvar
477 477
478@defvar misc-objects-consed 478@defvar misc-objects-consed
479The total number of miscellaneous objects that have been allocated so 479The total number of miscellaneous objects that have been allocated so
480far in this Emacs session. These include markers and overlays, plus 480far in this session. These include markers and overlays, plus
481certain objects not visible to users. 481certain objects not visible to users.
482@end defvar 482@end defvar
483 483
@@ -581,8 +581,8 @@ there is a fixed maximum. Alternatively, it can be @code{UNEVALLED},
581indicating a special form that receives unevaluated arguments, or 581indicating a special form that receives unevaluated arguments, or
582@code{MANY}, indicating an unlimited number of evaluated arguments (the 582@code{MANY}, indicating an unlimited number of evaluated arguments (the
583equivalent of @code{&rest}). Both @code{UNEVALLED} and @code{MANY} are 583equivalent of @code{&rest}). Both @code{UNEVALLED} and @code{MANY} are
584macros. If @var{max} is a number, it may not be less than @var{min} and 584macros. If @var{max} is a number, it must be more than @var{min} but
585it may not be greater than eight. 585less than 8.
586 586
587@item interactive 587@item interactive
588This is an interactive specification, a string such as might be used as 588This is an interactive specification, a string such as might be used as
@@ -666,8 +666,7 @@ read-only (on certain operating systems) as a result of dumping Emacs.
666@cindex @code{defsubr}, Lisp symbol for a primitive 666@cindex @code{defsubr}, Lisp symbol for a primitive
667 Defining the C function is not enough to make a Lisp primitive 667 Defining the C function is not enough to make a Lisp primitive
668available; you must also create the Lisp symbol for the primitive and 668available; you must also create the Lisp symbol for the primitive and
669store a suitable subr object in its function cell. The code looks like 669store a suitable subr object in its function cell:
670this:
671 670
672@example 671@example
673defsubr (&@var{sname}); 672defsubr (&@var{sname});