1 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a94987284de..eb276721dbc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.el (window-body-height, window-body-width): Mention in
+        the doc string that the return values are in frame's canonical
+        units.  (Bug#9949)
+
+2011-11-03  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for
+        change in cc-engine.el.
+
 2011-11-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.el (switch-to-buffer): Use `force-same-window' interactively.
@@ -136,7 +147,6 @@
 
         * progmodes/cc-langs.el (c-defun-tactic): Move this variable to
         cc-vars.el.
-        (c-nonlabel-token-2-key): New variable for change in cc-engine.el.
 
         * progmodes/cc-engine.el (c-beginning-of-statement-1):
         Prevent "class foo : bar" being spuriously recognized as a label.