Merge from trunk.

3 files changed, 12 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index bbb765ef58f..b494c8e3c96 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * themes/wombat-theme.el: Add a coding cookie.  (Bug#9905)
+
+2011-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * NEWS: Document the disappearance of binding caches (bug#9899).
+
 2011-10-01  Juanma Barranquero  <lekktu@gmail.com>
 
         * NEWS: Fix typo.  Remove duplicate info.
diff --git a/etc/NEWS b/etc/NEWS
index 9e407133e8b..4e38838c4d2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -967,6 +967,9 @@ has now been removed.
 
 ** cl.el no longer provides `cl-19'.
 
+** The menu bar bindings's caches are not used any more.
+Use (where-is-internal <def> nil t) instead.
+
 ** The following obsolete functions and aliases were removed:
 comint-kill-output, decompose-composite-char, outline-visible,
 internal-find-face, internal-get-face, frame-update-faces,
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
index 6691b4a4016..894a2444ab5 100644
--- a/etc/themes/wombat-theme.el
+++ b/etc/themes/wombat-theme.el
@@ -1,4 +1,4 @@
-;;; wombat-theme.el --- Custom face theme for Emacs
+;;; wombat-theme.el --- Custom face theme for Emacs  -*-coding: utf-8 -*-
 
 ;; Copyright (C) 2011 Free Software Foundation, Inc.