Merge from emacs-24; up to 2012-12-26T16:22:18Z!michael.albinus@gmx.de

[bpt/emacs.git] / lisp / calendar / todo-mode.el

diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index fdbcb04..c109ece 100644 (file)
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -281,11 +281,11 @@ show and mark todo entries for today, but may slow down processing of
 the diary file somewhat."
   :type 'string
   :group 'todo)
-(defcustom todo-file-do    (convert-standard-filename "~/.todo-do")
+(defcustom todo-file-do    (locate-user-emacs-file "todo-do" ".todo-do")
   "TODO mode list file."
   :type 'file
   :group 'todo)
-(defcustom todo-file-done  (convert-standard-filename "~/.todo-done")
+(defcustom todo-file-done  (locate-user-emacs-file "todo-done" ".todo-done")
   "TODO mode archive file."
   :type 'file
   :group 'todo)
@@ -315,7 +315,7 @@ window."
   :group 'todo)
 (defvar todo-edit-buffer " *TODO Edit*"
   "TODO Edit buffer name.")
-(defcustom todo-file-top (convert-standard-filename "~/.todo-top")
+(defcustom todo-file-top (locate-user-emacs-file "todo-top" ".todo-top")
   "TODO mode top priorities file.
 
 Not in TODO format, but diary compatible.