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 6646637c642ed88060d1f25d5a4e261d902acc32..6ca9eb4c93f147b6d8852914b4b490402823bd9d 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+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):