Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

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

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index bf08571..d9ebf07 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in: Replace non-portable use of $< in ordinary rules.
+
+2012-02-28  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi: Standardize possessive apostrophe usage.
+
+2012-02-17  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi (Design @value{COUNT-WORDS}, Syntax)
+       (count-words-in-defun): Fix cross-refs to Emacs manual.
+
 2012-01-28  Andreas Schwab  <schwab@linux-m68k.org>
 
        * emacs-lisp-intro.texi (Top): Move setting of COUNT-WORDS outside