2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/calendar/ChangeLog b/lisp/calendar/ChangeLog
index b794836dca4..1c26f253475 100644
--- a/lisp/calendar/ChangeLog
+++ b/lisp/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-01  Stephen Berman  <stephen.berman@gmx.net>
+
+        * todos.el (todos-filtered-items-mode-map): Fix omission in
+        previous change.
+        (todos-mode): Comment out invocation of easy-menu-add, since menu
+        definition was commented out in last change.
+
 2013-05-31  Stephen Berman  <stephen.berman@gmx.net>
 
         * todos.el: Move auto-mode-alist entries above provide sexp.
diff --git a/lisp/calendar/todos.el b/lisp/calendar/todos.el
index 415615c726d..b2e81273579 100644
--- a/lisp/calendar/todos.el
+++ b/lisp/calendar/todos.el
@@ -6000,8 +6000,8 @@ Filtered Items mode following todo (not done) items."
       (define-key map (nth 0 kb) (nth 1 kb)))
     (dolist (kb todos-key-bindings-t+f)
       (define-key map (nth 0 kb) (nth 1 kb)))
-    ("g" 'todos-go-to-source-item)
-    ([remap newline] 'todos-go-to-source-item)
+    (define-key map "g" 'todos-go-to-source-item)
+    (define-key map [remap newline] 'todos-go-to-source-item)
     map)
   "Todos Filtered Items mode keymap.")
 
@@ -6170,7 +6170,7 @@ Added to `window-configuration-change-hook' in `todos-mode'."
   "Major mode for displaying, navigating and editing Todo lists.
 
 \\{todos-mode-map}"
-  (easy-menu-add todos-menu)
+  ;; (easy-menu-add todos-menu)
   (todos-modes-set-1)
   (todos-modes-set-2)
   (todos-modes-set-3)