aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/intro.texi10
2 files changed, 8 insertions, 6 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f0e63278a77..a0df74bf3bc 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,9 @@
12012-05-04 Glenn Morris <rgm@gnu.org> 12012-05-04 Glenn Morris <rgm@gnu.org>
2 2
3 * intro.texi (Caveats): Copyedit.
4 (Lisp History): Convert inforef to xref.
5 (Lisp History, Printing Notation, Version Info): Improve page-breaks.
6
3 * elisp.texi (DATE): Forgot to change the month in 2012-04-21 change. 7 * elisp.texi (DATE): Forgot to change the month in 2012-04-21 change.
4 8
52012-05-01 Glenn Morris <rgm@gnu.org> 92012-05-01 Glenn Morris <rgm@gnu.org>
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 2e678e02158..c221286fece 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -74,7 +74,7 @@ real-life example for a function or group of functions, please make an
74effort to write it up and send it in. Please reference any comments to 74effort to write it up and send it in. Please reference any comments to
75the chapter name, section name, and function name, as appropriate, since 75the chapter name, section name, and function name, as appropriate, since
76page numbers and chapter and section numbers will change and we may have 76page numbers and chapter and section numbers will change and we may have
77trouble finding the text you are talking about. Also state the number 77trouble finding the text you are talking about. Also state the version
78of the edition you are criticizing. 78of the edition you are criticizing.
79@end iftex 79@end iftex
80@ifnottex 80@ifnottex
@@ -121,10 +121,10 @@ worry about it; this manual is self-contained.
121 121
122@pindex cl 122@pindex cl
123 A certain amount of Common Lisp emulation is available via the 123 A certain amount of Common Lisp emulation is available via the
124@file{cl} library. @inforef{Top, Overview, cl}. 124@file{cl} library. @xref{Top,, Overview, cl, Common Lisp Extensions}.
125 125
126 Emacs Lisp is not at all influenced by Scheme; but the GNU project has 126 Emacs Lisp is not at all influenced by Scheme; but the GNU project has
127an implementation of Scheme, called Guile. We use Guile in all new GNU 127an implementation of Scheme, called Guile. We use it in all new GNU
128software that calls for extensibility. 128software that calls for extensibility.
129 129
130@node Conventions 130@node Conventions
@@ -258,7 +258,7 @@ displayed in the echo area.
258 258
259 Examples in this manual indicate printed text with @samp{@print{}}, 259 Examples in this manual indicate printed text with @samp{@print{}},
260irrespective of where that text goes. The value returned by 260irrespective of where that text goes. The value returned by
261evaluating the form (here @code{bar}) follows on a separate line with 261evaluating the form follows on a separate line with
262@samp{@result{}}. 262@samp{@result{}}.
263 263
264@example 264@example
@@ -511,8 +511,6 @@ numeric components, such as @code{"22.0.91.1"}, indicates an
511unreleased test version. 511unreleased test version.
512@end defvar 512@end defvar
513 513
514 The following two variables have existed since Emacs version 19.23:
515
516@defvar emacs-major-version 514@defvar emacs-major-version
517The major version number of Emacs, as an integer. For Emacs version 515The major version number of Emacs, as an integer. For Emacs version
51823.1, the value is 23. 51623.1, the value is 23.