Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca

1 files changed, 29 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5efa7810ad2..1fc7b5d49ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,32 @@
+2013-01-25  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el: Enhancements to header documentation about
+        skeletons.  (Bug#5716)
+
+        * imenu.el (imenu-default-create-index-function): Remove useless
+        infinite loop check.  (Bug#13438)
+
+2013-01-25  Alan Mackenzie  <acm@muc.de>
+
+        Fix a bug in the state cache mechanism.  Refactor this a bit.
+
+        * progmodes/cc-engine.el (c-parse-state-get-strategy): Remove the
+        `cache-pos' element from the return value.
+        (c-append-lower-brace-pair-to-state-cache): "Narrow" to end of
+        buffer to enable proper searching from beyond HERE.  Amend the
+        test for detecting the sought brace pair.  Amend the value written
+        to the "brace desert cache" when the brace isn't found.
+        (c-remove-stale-state-cache): Rename `good-pos' to `start-point',
+        and several other variables analogously.
+        (c-remove-stale-state-cache-backwards): Change `cache-pos' from a
+        parameter to a locally calculated variable.
+        (c-parse-state-1): Change the calling conventions to the two
+        defuns involving `cache-pos'.
+
+2013-01-25  Chong Yidong  <cyd@gnu.org>
+
+        * xml.el (xml-entity-or-char-ref-re): Fix regexp.
+
 2013-01-24  Aaron Ecay <aaronecay@gmail.com>  (tiny change)
 
         * paren.el (show-paren-function): Make sure to set 'priority and