HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
8fd4116
..
c109ece
100644
(file)
--- a/
lisp/calendar/todo-mode.el
+++ b/
lisp/calendar/todo-mode.el
@@
-1,7
+1,6
@@
;;; todo-mode.el --- major mode for editing TODO list files
;;; todo-mode.el --- major mode for editing TODO list files
-;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001-2013 Free Software Foundation, Inc.
;; Author: Oliver Seidel <privat@os10000.net>
;; Maintainer: Stephen Berman <stephen.berman@gmx.net>
;; Author: Oliver Seidel <privat@os10000.net>
;; Maintainer: Stephen Berman <stephen.berman@gmx.net>
@@
-32,7
+31,7
@@
;; TODO is a major mode for EMACS which offers functionality to
;; treat most lines in one buffer as a list of items one has to
;; do. There are facilities to add new items, which are
;; TODO is a major mode for EMACS which offers functionality to
;; treat most lines in one buffer as a list of items one has to
;; do. There are facilities to add new items, which are
-;; categori
s
ed, to edit or even delete items from the buffer.
+;; categori
z
ed, to edit or even delete items from the buffer.
;; The buffer contents are currently compatible with the diary,
;; so that the list of todo-items will show up in the FANCY diary
;; mode.
;; The buffer contents are currently compatible with the diary,
;; so that the list of todo-items will show up in the FANCY diary
;; mode.
@@
-62,14
+61,14
@@
;;
;; The TODO list file has a special format and some auxiliary
;; information, which will be added by the todo-show function if
;;
;; The TODO list file has a special format and some auxiliary
;; information, which will be added by the todo-show function if
-;; it attempts to visit an un-initiali
s
ed file. Hence it is
+;; it attempts to visit an un-initiali
z
ed file. Hence it is
;; recommended to use the todo-show function for the first time,
;; recommended to use the todo-show function for the first time,
-;; in order to initiali
s
e the file, but it is not necessary
+;; in order to initiali
z
e the file, but it is not necessary
;; afterwards.
;;
;; As these commands are quite long to type, I would recommend
;; the addition of two bindings to your to your global keymap. I
;; afterwards.
;;
;; As these commands are quite long to type, I would recommend
;; the addition of two bindings to your to your global keymap. I
-;; personally have the following in my initiali
s
ation file:
+;; personally have the following in my initiali
z
ation file:
;;
;; (global-set-key "\C-ct" 'todo-show) ; switch to TODO buffer
;; (global-set-key "\C-ci" 'todo-insert-item) ; insert new item
;;
;; (global-set-key "\C-ct" 'todo-show) ; switch to TODO buffer
;; (global-set-key "\C-ci" 'todo-insert-item) ; insert new item
@@
-282,11
+281,11
@@
show and mark todo entries for today, but may slow down processing of
the diary file somewhat."
:type 'string
:group 'todo)
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)
"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)
"TODO mode archive file."
:type 'file
:group 'todo)
@@
-316,7
+315,7
@@
window."
:group 'todo)
(defvar todo-edit-buffer " *TODO Edit*"
"TODO Edit buffer name.")
: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.
"TODO mode top priorities file.
Not in TODO format, but diary compatible.
@@
-537,7
+536,7
@@
Use `todo-categories' instead.")
(unless (zerop (buffer-size buf))
(and (null todo-categories)
(null todo-cats)
(unless (zerop (buffer-size buf))
(and (null todo-categories)
(null todo-cats)
- (error "Error in %s: File is non-empty but contains no category"
+ (error "Error in %s: File is non-empty but contains no category"
todo-file-do)))
(unless cat (setq cat (read-from-minibuffer prompt)))
(with-current-buffer buf
todo-file-do)))
(unless cat (setq cat (read-from-minibuffer prompt)))
(with-current-buffer buf
@@
-973,5
+972,4
@@
If INCLUDE-SEP is non-nil, return point after the separator."
(provide 'todo-mode)
(provide 'todo-mode)
-;; arch-tag: 6fd91be5-776e-4464-a109-da4ea0e4e497
;;; todo-mode.el ends here
;;; todo-mode.el ends here