Merge from trunk.

[bpt/emacs.git] / doc / lispintro / ChangeLog

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 993d0d0..5e46555 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,44 @@
+2013-04-24  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last
+       commit.
+
+2013-04-24  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi (emacsver.texi): Include it.
+       (copying): For non-printed versions, uses Emacs version rather
+       than that of the printed book.
+       (Complications, Lisp macro, defvar and asterisk, defcustom): Copyedits.
+       * Makefile.in (emacsdir): New variable..
+       (MAKEINFO_OPTS, ENVADD): Add $emacsdir.
+       (srcs): Add emacsver.texi.
+       (dist): Include emacsver.texi.  Edit emacsdir.
+       * makefile.w32-in (emacsdir): New variable.
+       (INFO_SOURCES): Add emacsver.texi.
+       (ENVADD): Add $emacsdir (and $texinfodir).
+
+2013-04-23  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * emacs-lisp-intro.texi (Complications, defvar, Writing Defuns)
+       (Prevent confusion, Determining the Element, lambda): Refine the
+       doc about Lisp macros, reported by Glenn Morris.
+
+2013-04-21  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * emacs-lisp-intro.texi (defcustom, defun)
+       (simplified-beginning-of-buffer, defvar, Building Robots, Review)
+       (save-excursion): `defun' and `defcustom' are now macros rather
+       than special forms. (Bug#13853)
+
+2013-03-16  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org.
+
+2013-03-03  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi (Digression into C): Update example.
+       (defcustom, Simple Extension): Fix typos.
+
 2012-12-22  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (srcs): New variable, adding doclicense.texi.