Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl.web@gmail.com

[gnu-emacs] / doc / lispintro / ChangeLog

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 1191b0de919744baa3542ba1322fc6e92c75c966..e556fa7e9980ecf9b04b38d200cf0286314fd87d 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-09  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.
+       (Void Function, Wrong Type of Argument, Recursion with list)
+       (Simple Extension): Assume a non-ancient Emacs.
+       (Void Variable, Switching Buffers): Improve page breaks.
+
+       * emacs-lisp-intro.texi: Update GNU Press contact details.
+
 2012-05-05  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.