Merge from mh-e; up to 2012-01-03T19:41:14Z!larsi@gnus.org.

[gnu-emacs] / doc / lispintro / ChangeLog

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 4c702f7dc2ee28aa0e32e91cf7cb2c9fdd69dd75..6ca9eb4c93f147b6d8852914b4b490402823bd9d 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,7 +1,20 @@
+2014-02-25  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi (X11 Colors): Don't use setq with hooks.
+
+2014-02-06  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi (Recursive Patterns):
+       Do not use colons in index entries.
+
+2014-01-23  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp-intro.texi (lengths-list-file): Fix textual parentheses.
+
 2013-12-30  Paul Eggert  <eggert@cs.ucla.edu>
 
-       Specify info encoding and language (Bug#16292).
-       * emacs-lisp-intro.texi: Add @documentencoding, @documentlanguage.
+       Specify .texi encoding (Bug#16292).
+       * emacs-lisp-intro.texi: Add @documentencoding.
 
 2013-12-30  Glenn Morris  <rgm@gnu.org>
 
@@ -60,8 +73,8 @@
        (emacs-lisp-intro.ps): Remove explicit rule.
        (emacs-lisp-intro.html): Use HTML_OPTS.
        (clean): Use DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS.
-       (.PHONY): install-dvi, install-html, install-pdf, install-ps
-       ,install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
+       (.PHONY): install-dvi, install-html, install-pdf, install-ps,
+       install-doc, uninstall-dvi, uninstall-html, uninstall-pdf,
        uninstall-ps, and uninstall-doc.
        (install-dvi, install-html, install-pdf, install-ps, install-doc)
        (uninstall-dvi, uninstall-html, uninstall-ps, uninstall-pdf)
@@ -704,7 +717,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2013 Free Software Foundation, Inc.
+  Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.