Merge changes from emacs-23 branch

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3758c3e97b08f19ed2f0e88b69c014cbb6d29a33..f69eeeaadd4a84249861c0a211d0c9cd05f6af8a 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * variables.texi (Creating Buffer-Local): Warn against misuses of
+       make-variable-buffer-local (bug#10258).
+
 2012-01-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * macros.texi (Defining Macros): Document `doc-string' (bug#9668).