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 0d6df0d54331853eaa0a4664ee5e8d3d7d186ffb..e556fa7e9980ecf9b04b38d200cf0286314fd87d 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,19 +1,35 @@
-2012-05-04  Glenn Morris  <rgm@gnu.org>
+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.
 
-2012-05-03  Glenn Morris  <rgm@gnu.org>
+       * 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.
+       (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-04-28  Glenn Morris  <rgm@gnu.org>
+2012-05-04  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
+       (info, infoclean): Use $INFO_EXT.
+       (${infodir}/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
+       * makefile.w32-in (INFO_EXT, INFO_OPTS): New.
+       (INFO_TARGETS, clean): Use $INFO_EXT.
+       ($(infodir)/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
+
+2012-05-02  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp-intro.texi (Syntax): Reword to avoid underfull hbox.
 
-2012-04-07  Glenn Morris  <rgm@gnu.org>
+2012-04-14  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in: Replace non-portable use of $< in ordinary rules.