diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-06-12 07:27:12 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-06-12 07:27:12 +0000 |
| commit | 476e9367ec1f440aa23904b7bc482ea4a3b8041c (patch) | |
| tree | 4f7f5a5e9a6668f908834bb6e216c8fa3727d4b3 /lispintro | |
| parent | a13f8f50d4cc544d3bbfa78568e82ce09e68bded (diff) | |
| parent | 6b519504c3297595101628e823e72c91e562ab45 (diff) | |
| download | emacs-476e9367ec1f440aa23904b7bc482ea4a3b8041c.tar.gz | |
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-294
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-295
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-296
Update from CVS: admin/FOR-RELEASE: Update refcard section.
* emacs@sv.gnu.org/emacs--devo--0--patch-297
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-298
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-299
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-300
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-301
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-302
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-303
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-304
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-103
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-104
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-570
Diffstat (limited to 'lispintro')
| -rw-r--r-- | lispintro/ChangeLog | 5 | ||||
| -rw-r--r-- | lispintro/emacs-lisp-intro.texi | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog index 731e734f78c..d2316d59aa6 100644 --- a/lispintro/ChangeLog +++ b/lispintro/ChangeLog @@ -1,3 +1,8 @@ +2006-05-25 David Kastrup <dak@gnu.org> + + * emacs-lisp-intro.texi (setcar): replace an antelope rather than + a giraffe with a hippopotamus. + 2006-05-19 Thien-Thi Nguyen <ttn@gnu.org> * emacs-lisp-intro.texi (Digression concerning error): Fix typo. diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi index f941f3e44ba..5d513256daf 100644 --- a/lispintro/emacs-lisp-intro.texi +++ b/lispintro/emacs-lisp-intro.texi @@ -7061,7 +7061,7 @@ The first element on the list, @code{antelope} is replaced by @code{hippopotamus}. So we can see that @code{setcar} did not add a new element to the list -as @code{cons} would have; it replaced @code{giraffe} with +as @code{cons} would have; it replaced @code{antelope} with @code{hippopotamus}; it @emph{changed} the list. @node setcdr, cons Exercise, setcar, car cdr & cons |