2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e8e3d71c66..4739407547b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2012-09-12  Stephen Berman  <stephen.berman@gmx.net>
 
+        * calendar/todos.el (todos-list-categories): Fix typos.
+        (todos-show): Ensure file is in todos-mode.
+
+2012-09-12  Stephen Berman  <stephen.berman@gmx.net>
+
         * calendar/todos.el (todos-header): Remove defvar.
         (todos-add-category): Comment out code that inserts and updates
         the file local variables first line of the file todos-file-do.
diff --git a/lisp/calendar/todos.el b/lisp/calendar/todos.el
index 9e0cf90a048..1689c80d820 100644
--- a/lisp/calendar/todos.el
+++ b/lisp/calendar/todos.el
@@ -800,7 +800,7 @@ Number of entries for each category is given by `todos-print-priorities'."
           (widen)
           (goto-char (point-max))
           (while (re-search-backward
-                  (concat "^" (regexp-quote (concat todo-prefix todo-category-beg))
+                  (concat "^" (regexp-quote (concat todos-prefix todos-category-beg))
                           "\\(.*\\)\n")
                   (point-min) t)
             (push (match-string-no-properties 1) categories)))))
@@ -950,6 +950,7 @@ Number of entries for each category is given by `todos-print-priorities'."
             (equal (expand-file-name todos-file-do) bufname)))
       (find-file todos-file-do)
     (todos-initial-setup))
+  (unless (eq major-mode 'todos-mode) (todos-mode))
   (unless todos-categories
     (setq todos-categories (todos-list-categories)))
   ;; (beginning-of-line)