* calendar/todos.el (todos-list-categories): Fix typos.

(todos-show): Ensure file is in todos-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e8e3d71c6628f3b07108b52c05d5c3249b1490f..4739407547b1afd0a5d9ce3678fbda97fd55b47e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/lisp/calendar/todos.el b/lisp/calendar/todos.el
index 9e0cf90a04876083b43f141f85b0d8302899f521..1689c80d82059d34262c04380ac762c3a6acec85 100644 (file)
--- 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)