[Emacs-diffs] Changes to emacs/lispintro/emacs-lisp-intro.texi

[Robert J. Chassell]

Index: emacs/lispintro/emacs-lisp-intro.texi
diff -c emacs/lispintro/emacs-lisp-intro.texi:1.14 
emacs/lispintro/emacs-lisp-intro.texi:1.15
*** emacs/lispintro/emacs-lisp-intro.texi:1.14  Sat Apr 27 09:10:05 2002
--- emacs/lispintro/emacs-lisp-intro.texi       Thu Jun  6 12:17:38 2002
***************
*** 21,28 ****
  
  @comment %**end of header
  
! @set edition-number 2.05
! @set update-date 2002 Jan 5
  
  @ignore
   ## Summary of shell commands to create various output formats:
--- 21,28 ----
  
  @comment %**end of header
  
! @set edition-number 2.06
! @set update-date 2002 Jun  6
  
  @ignore
   ## Summary of shell commands to create various output formats:
***************
*** 6696,6703 ****
  @end smallexample
  
  @noindent
! appear in the echo area.  @code{cons} puts a new element at the
! beginning of a list; it attaches or pushes elements onto the list.
  
  @menu
  * Build a list::
--- 6696,6711 ----
  @end smallexample
  
  @noindent
! appear in the echo area.  @code{cons} causes the creation of a new
! list in which the element is followed by the elements of the original
! list.
! 
! We often say that address@hidden puts a new element at the beginning of
! a list; it attaches or pushes elements onto the list', but this
! phrasing can be misleading, since @code{cons} does not change an
! existing list, but creates a new one.
! 
! Like @code{car} and @code{cdr}, @code{cons} is non-destructive.
  
  @menu
  * Build a list::
***************
*** 7191,7197 ****
  
  @need 1200
  @noindent
! The function @code{cons} can be used to add a piece of text to the list,
  like this:
  
  @smallexample
--- 7199,7206 ----
  
  @need 1200
  @noindent
! The function @code{cons} can be used to to create a new list from a
! piece of text (an `atom', to use the jargon) and an existing list,
  like this:
  
  @smallexample
***************
*** 7777,7784 ****
  macros, see @ref{Macros, , Macros, elisp, The GNU Emacs Lisp Reference
  Manual}.  The C programming language also provides macros.  These are
  different, but also useful.  We will briefly look at C macros in
! @ref{Digression into C, , @code{delete-and-extract-region}:
! Digressing into C}.
  
  @need 1200
  If the string has content, then another conditional expression is
--- 7786,7792 ----
  macros, see @ref{Macros, , Macros, elisp, The GNU Emacs Lisp Reference
  Manual}.  The C programming language also provides macros.  These are
  different, but also useful.  We will briefly look at C macros in
! @ref{Digression into C}.
  
  @need 1200
  If the string has content, then another conditional expression is
***************
*** 7827,7833 ****
  
  @node Digression into C, defvar, kill-region, Cutting & Storing Text
  @comment  node-name,  next,  previous,  up
! @section @code{delete-and-extract-region}: Digressing into C
  @findex delete-and-extract-region
  @cindex C, a digression into
  @cindex Digression into C
--- 7835,7841 ----
  
  @node Digression into C, defvar, kill-region, Cutting & Storing Text
  @comment  node-name,  next,  previous,  up
! @section Digression into C
  @findex delete-and-extract-region
  @cindex C, a digression into
  @cindex Digression into C
***************
*** 9798,9804 ****
  @code{eval-last-sexp}.  This will cause the result of the evaluation
  to be printed in the @file{*scratch*} buffer instead of being printed
  in the echo area.  (Otherwise you will see something like this in your
! echo area: @code{^Jgiraffe^J^Jgazelle^J^Jlion^J^Jtiger^Jnil}, in which
  each @samp{^J} stands for a `newline'.)
  
  @need 1500
--- 9806,9812 ----
  @code{eval-last-sexp}.  This will cause the result of the evaluation
  to be printed in the @file{*scratch*} buffer instead of being printed
  in the echo area.  (Otherwise you will see something like this in your
! echo area: @code{^Jgazelle^J^Jgiraffe^J^Jlion^J^Jtiger^Jnil}, in which
  each @samp{^J} stands for a `newline'.)
  
  @need 1500
***************
*** 9827,9836 ****
  
  @smallexample
  @group
- giraffe
- 
  gazelle
  
  lion
  
  tiger
--- 9835,9844 ----
  
  @smallexample
  @group
  gazelle
  
+ giraffe
+ 
  lion
  
  tiger
***************
*** 10539,10547 ****
  A recursive function contains code that tells the Lisp interpreter to
  call a program that runs exactly like itself, but with slightly
  different arguments.  The code runs exactly the same because it has
! the same name.  However, even though it has the same name, it is not
! the same thread of execution.  It is different.  In the jargon, it is
! a different `instance'.
  
  Eventually, if the program is written correctly, the `slightly
  different arguments' will become sufficiently different from the first
--- 10547,10555 ----
  A recursive function contains code that tells the Lisp interpreter to
  call a program that runs exactly like itself, but with slightly
  different arguments.  The code runs exactly the same because it has
! the same name.  However, even though the program has the same name, it
! is not the same entity.  It is different.  In the jargon, it is a
! different `instance'.
  
  Eventually, if the program is written correctly, the `slightly
  different arguments' will become sufficiently different from the first
***************
*** 10745,10754 ****
  
  @smallexample
  @group
- giraffe
- 
  gazelle
  
  lion
  
  tiger
--- 10753,10762 ----
  
  @smallexample
  @group
  gazelle
  
+ giraffe
+ 
  lion
  
  tiger
***************
*** 11296,11302 ****
  argument of 6.  That is to say, the first calculation is:
  
  @smallexample
! (+ 7 (triangle-recursively 6)
  @end smallexample
  
  @noindent
--- 11304,11310 ----
  argument of 6.  That is to say, the first calculation is:
  
  @smallexample
! (+ 7 (triangle-recursively 6))
  @end smallexample
  
  @noindent
***************
*** 11318,11331 ****
  Now the total is:
  
  @smallexample
! (+ 7 6 (triangle-recursively 5)
  @end smallexample
  
  @need 800
  And what happens next?
  
  @smallexample
! (+ 7 6 5 (triangle-recursively 4)
  @end smallexample
  
  Each time @code{triangle-recursively} is called, except for the last
--- 11326,11339 ----
  Now the total is:
  
  @smallexample
! (+ 7 6 (triangle-recursively 5))
  @end smallexample
  
  @need 800
  And what happens next?
  
  @smallexample
! (+ 7 6 5 (triangle-recursively 4))
  @end smallexample
  
  Each time @code{triangle-recursively} is called, except for the last