Merge from trunk.

1 files changed, 20 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae54b3733f6..0ea3d94a01f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,25 @@
+2011-07-18  Alan Mackenzie  <acm@muc.de>
+
+        Fontify declarators properly when, e.g., a jit-lock chunk begins
+        inside a declaration.
+
+        * progmodes/cc-langs.el (c-symbol-chars): Correct a typo.
+
+        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): New
+        function.
+        (c-complex-decl-matchers): Insert reference to
+        c-font-lock-enclosing-decls.
+
+        * progmodes/cc-engine.el (c-backward-single-comment):
+        (c-backward-comments): Bind open-paren-in-column-0-is-defun-start
+        to nil around calls to (forward-comment -1).
+
 2011-07-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * image.el (put-image): Doc typo fix.
+
+        * progmodes/etags.el (tags-search): Doc typo fix.
+
         * mail/smtpmail.el (smtpmail-via-smtp): Query the user for
         password if we get errors 550 to 554.