Merge from emacs-24; up to 2012-12-27T08:21:08Z!rgm@gnu.org

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8c0f6290420bb6dc385d3108ceeffdc627d50da..340dc41a744f3db0fbaf80bbfa9be8a3a16bb9b9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2013-04-26  Glenn Morris  <rgm@gnu.org>
+
+       * subr.el (read-number): Once more use `read' rather than
+       `string-to-number', to trap non-numeric input.  (Bug#14254)
+
+2013-04-26  Erik Charlebois  <erikcharlebois@gmail.com>
+
+       * emacs-lisp/syntax.el (syntax-propertize-multiline):
+       Use `syntax-multiline' text property consistently instead of
+       `font-lock-multiline'. (bug#14237).
+
 2013-04-26  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/shadow.el (list-load-path-shadows):