* todos.el (todos-read-category, todos-merge-category):

Fix argument value to accord with documented change from 2013-05-14.

diff --git a/lisp/calendar/ChangeLog b/lisp/calendar/ChangeLog
index aa78ac4df7eb0d800aa33ac4d9369ab817dc3084..f341a337e6acb39503206c65da6cb1991b0dc2b1 100644 (file)
--- a/lisp/calendar/ChangeLog
+++ b/lisp/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-04  Stephen Berman  <stephen.berman@gmx.net>
+
+       * todos.el (todos-read-category, todos-merge-category):
+       Fix argument value to accord with documented change from 2013-05-14.
+
 2013-06-03  Stephen Berman  <stephen.berman@gmx.net>
 
        * todos.el: More code cleanup.  Update file copyright and author

diff --git a/lisp/calendar/todos.el b/lisp/calendar/todos.el
index 6c7e68e5b752a4c84280069f76094c5f20728acf..6622f9fde360632fd2838d5af22e23bb2714673e 100644 (file)
--- a/lisp/calendar/todos.el
+++ b/lisp/calendar/todos.el
@@ -761,7 +761,7 @@ category."
         (archive (concat (file-name-sans-extension (if file gfile tfile))
                          ".toda"))
         (cat (todos-current-category))
-        (cat+file (todos-read-category "Merge into category: " 'merge file))
+        (cat+file (todos-read-category "Merge into category: " 'todo file))
         (goal (car cat+file))
         (gfile  (cdr cat+file))
         archived-count here)
@@ -4719,7 +4719,7 @@ categories from `todos-category-completions-files'."
                              completions)))
           (completion-ignore-case todos-completion-ignore-case)
           (cat (completing-read prompt categories nil
-                                (eq match-type 'merge) nil nil
+                                (eq match-type 'todo) nil nil
                                 ;; Unless we're adding a category via
                                 ;; todos-add-category, set default
                                 ;; for existing categories to the