From: Stephen Berman Date: Tue, 4 Jun 2013 11:06:18 +0000 (+0200) Subject: * todos.el (todos-read-category, todos-merge-category): X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2035 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d12ff8b3344d4284f78e0be56cda076f9a3d6e7;p=emacs.git * 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 aa78ac4df7e..f341a337e6a 100644 --- a/lisp/calendar/ChangeLog +++ b/lisp/calendar/ChangeLog @@ -1,3 +1,8 @@ +2013-06-04 Stephen Berman + + * 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 * todos.el: More code cleanup. Update file copyright and author diff --git a/lisp/calendar/todos.el b/lisp/calendar/todos.el index 6c7e68e5b75..6622f9fde36 100644 --- 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