aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert J. Chassell2002-06-06 16:17:38 +0000
committerRobert J. Chassell2002-06-06 16:17:38 +0000
commitb15dd613150d3ec3eaac395c31b6ef9a8c42f761 (patch)
tree9200938ccdb9e336fa219670a5b997d0332fe9ea
parent5ec3b9b837db4bd21219721f60d95bb8e524b545 (diff)
downloademacs-b15dd613150d3ec3eaac395c31b6ef9a8c42f761.tar.gz
emacs-b15dd613150d3ec3eaac395c31b6ef9a8c42f761.zip
Fix typos, clarify language.
-rw-r--r--lispintro/emacs-lisp-intro.texi46
1 files changed, 27 insertions, 19 deletions
diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi
index 744069caffd..34d9044ca36 100644
--- a/lispintro/emacs-lisp-intro.texi
+++ b/lispintro/emacs-lisp-intro.texi
@@ -21,8 +21,8 @@
21 21
22@comment %**end of header 22@comment %**end of header
23 23
24@set edition-number 2.05 24@set edition-number 2.06
25@set update-date 2002 Jan 5 25@set update-date 2002 Jun 6
26 26
27@ignore 27@ignore
28 ## Summary of shell commands to create various output formats: 28 ## Summary of shell commands to create various output formats:
@@ -6696,8 +6696,16 @@ After evaluating this list, you will see
6696@end smallexample 6696@end smallexample
6697 6697
6698@noindent 6698@noindent
6699appear in the echo area. @code{cons} puts a new element at the 6699appear in the echo area. @code{cons} causes the creation of a new
6700beginning of a list; it attaches or pushes elements onto the list. 6700list in which the element is followed by the elements of the original
6701list.
6702
6703We often say that `@code{cons} puts a new element at the beginning of
6704a list; it attaches or pushes elements onto the list', but this
6705phrasing can be misleading, since @code{cons} does not change an
6706existing list, but creates a new one.
6707
6708Like @code{car} and @code{cdr}, @code{cons} is non-destructive.
6701 6709
6702@menu 6710@menu
6703* Build a list:: 6711* Build a list::
@@ -7191,7 +7199,8 @@ look like this:
7191 7199
7192@need 1200 7200@need 1200
7193@noindent 7201@noindent
7194The function @code{cons} can be used to add a piece of text to the list, 7202The function @code{cons} can be used to to create a new list from a
7203piece of text (an `atom', to use the jargon) and an existing list,
7195like this: 7204like this:
7196 7205
7197@smallexample 7206@smallexample
@@ -7777,8 +7786,7 @@ expression which will in turn compute the value. In this case, the
7777macros, see @ref{Macros, , Macros, elisp, The GNU Emacs Lisp Reference 7786macros, see @ref{Macros, , Macros, elisp, The GNU Emacs Lisp Reference
7778Manual}. The C programming language also provides macros. These are 7787Manual}. The C programming language also provides macros. These are
7779different, but also useful. We will briefly look at C macros in 7788different, but also useful. We will briefly look at C macros in
7780@ref{Digression into C, , @code{delete-and-extract-region}: 7789@ref{Digression into C}.
7781Digressing into C}.
7782 7790
7783@need 1200 7791@need 1200
7784If the string has content, then another conditional expression is 7792If the string has content, then another conditional expression is
@@ -7827,7 +7835,7 @@ the kill ring as the latest item, and sets the
7827 7835
7828@node Digression into C, defvar, kill-region, Cutting & Storing Text 7836@node Digression into C, defvar, kill-region, Cutting & Storing Text
7829@comment node-name, next, previous, up 7837@comment node-name, next, previous, up
7830@section @code{delete-and-extract-region}: Digressing into C 7838@section Digression into C
7831@findex delete-and-extract-region 7839@findex delete-and-extract-region
7832@cindex C, a digression into 7840@cindex C, a digression into
7833@cindex Digression into C 7841@cindex Digression into C
@@ -9798,7 +9806,7 @@ expression, @code{(print-elements-of-list animals)}, by typing
9798@code{eval-last-sexp}. This will cause the result of the evaluation 9806@code{eval-last-sexp}. This will cause the result of the evaluation
9799to be printed in the @file{*scratch*} buffer instead of being printed 9807to be printed in the @file{*scratch*} buffer instead of being printed
9800in the echo area. (Otherwise you will see something like this in your 9808in the echo area. (Otherwise you will see something like this in your
9801echo area: @code{^Jgiraffe^J^Jgazelle^J^Jlion^J^Jtiger^Jnil}, in which 9809echo area: @code{^Jgazelle^J^Jgiraffe^J^Jlion^J^Jtiger^Jnil}, in which
9802each @samp{^J} stands for a `newline'.) 9810each @samp{^J} stands for a `newline'.)
9803 9811
9804@need 1500 9812@need 1500
@@ -9827,10 +9835,10 @@ this:
9827 9835
9828@smallexample 9836@smallexample
9829@group 9837@group
9830giraffe
9831
9832gazelle 9838gazelle
9833 9839
9840giraffe
9841
9834lion 9842lion
9835 9843
9836tiger 9844tiger
@@ -10539,9 +10547,9 @@ up the number of pebbles in a triangle.
10539A recursive function contains code that tells the Lisp interpreter to 10547A recursive function contains code that tells the Lisp interpreter to
10540call a program that runs exactly like itself, but with slightly 10548call a program that runs exactly like itself, but with slightly
10541different arguments. The code runs exactly the same because it has 10549different arguments. The code runs exactly the same because it has
10542the same name. However, even though it has the same name, it is not 10550the same name. However, even though the program has the same name, it
10543the same thread of execution. It is different. In the jargon, it is 10551is not the same entity. It is different. In the jargon, it is a
10544a different `instance'. 10552different `instance'.
10545 10553
10546Eventually, if the program is written correctly, the `slightly 10554Eventually, if the program is written correctly, the `slightly
10547different arguments' will become sufficiently different from the first 10555different arguments' will become sufficiently different from the first
@@ -10745,10 +10753,10 @@ When you evaluate @code{(print-elements-recursively animals)} in the
10745 10753
10746@smallexample 10754@smallexample
10747@group 10755@group
10748giraffe
10749
10750gazelle 10756gazelle
10751 10757
10758giraffe
10759
10752lion 10760lion
10753 10761
10754tiger 10762tiger
@@ -11296,7 +11304,7 @@ the number 7 to the value returned by a second instance of
11296argument of 6. That is to say, the first calculation is: 11304argument of 6. That is to say, the first calculation is:
11297 11305
11298@smallexample 11306@smallexample
11299(+ 7 (triangle-recursively 6) 11307(+ 7 (triangle-recursively 6))
11300@end smallexample 11308@end smallexample
11301 11309
11302@noindent 11310@noindent
@@ -11318,14 +11326,14 @@ metaphor, it asks yet another robot to help it.
11318Now the total is: 11326Now the total is:
11319 11327
11320@smallexample 11328@smallexample
11321(+ 7 6 (triangle-recursively 5) 11329(+ 7 6 (triangle-recursively 5))
11322@end smallexample 11330@end smallexample
11323 11331
11324@need 800 11332@need 800
11325And what happens next? 11333And what happens next?
11326 11334
11327@smallexample 11335@smallexample
11328(+ 7 6 5 (triangle-recursively 4) 11336(+ 7 6 5 (triangle-recursively 4))
11329@end smallexample 11337@end smallexample
11330 11338
11331Each time @code{triangle-recursively} is called, except for the last 11339Each time @code{triangle-recursively} is called, except for the last