Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ebaea892a192dbf40578e2f99e8609310e4c6a1f..5d915a39814b15a77c8a863559a6759e1e73b8ba 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/cperl-mode.el (cperl-mode): Yet another fix for
+       syntax-propertize-function (bug#10095).
+
 2012-08-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * help-fns.el (help-fns--key-bindings, help-fns--signature)