*** empty log message ***

2 files changed, 5 insertions, 6 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 97a1e663d0f..0f78f13946e 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -63,9 +63,6 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00455.html
 ** lennart.borgman@gmail.com, Apr 11: before-string in overlay
 http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00153.html
 
-** nickrob@snap.net.nz, April 12: display margin errors on a tty
-http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00220.html
-
 ** footnote.el doesn't really let people customize footnote-style.
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00406.html
 
@@ -73,9 +70,6 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00406.html
    default-directory does not work right.                                      
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00342.html
 
-** tmm-menubar breaks in org mode
-http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00230.html
-
 ** BibTeX-mode: bibtex-user-optional-fields: INIT without {}
 http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00255.html
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66df4f750b0..faee838050e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-13  Glenn Morris  <rgm@gnu.org>
+
+        * tmm.el (tmm-get-keybind): Use car-safe to avoid errors with
+        inherited keymaps.
+
 2007-04-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * outline.el (outline-get-next-sibling): Clarify docstring.