tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Allow inserting diary entries last in date tree

Browse source 
* org-agenda.el (org-agenda-insert-diary-strategy): Add new value
  'date-tree-last.
  (org-agenda-insert-diary-make-new-entry): Handle
  `org-agenda-insert-diary-strategy' set to 'date-tree-last.

To allow for diary entries to be entered in time order in the date tree,
add a new value to `org-agenda-insert-diary-strategy' that allows for
this.  The code for handling this value, 'date-tree-last, is a bit
tricky, as we need to keep track of whether the date-tree already had
one or more entries for the given date.
This commit is contained in:
Nikolai Weibull 2015-08-24 10:40:58 +02:00 committed by Nicolas Goaziou
parent 5bfdfc5df7
commit 1fd103293c
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lisp/org-agenda.el
View file

@ -9417,11 +9417,13 @@ buffer, display it in another window."
"Where in `org-agenda-diary-file' should new entries be added?
Valid values:
date-tree in the date tree, as child of the date
top-level as top-level entries at the end of the file."
date-tree in the date tree, as first child of the date
date-tree-last in the date tree, as last child of the date
top-level as top-level entries at the end of the file."
:group 'org-agenda
:type '(choice
(const :tag "in a date tree" date-tree)
(const :tag "first in a date tree" date-tree)
(const :tag "last in a date tree" date-tree-last)
(const :tag "as top level at end of file" top-level)))
(defcustom org-agenda-insert-diary-extract-time nil
@ -9525,14 +9527,20 @@ a timestamp can be added there."
(when org-adapt-indentation (org-indent-to-column 2)))
(defun org-agenda-insert-diary-make-new-entry (text)
"Make a new entry with TEXT as the first child of the current subtree.
"Make a new entry with TEXT as a child of the current subtree.
Position the point in the heading's first body line so that
a timestamp can be added there."
(outline-next-heading)
(org-back-over-empty-lines)
(unless (looking-at "[ \t]*$") (save-excursion (insert "\n")))
(org-insert-heading nil t)
(org-do-demote)
(cond
((eq org-agenda-insert-diary-strategy 'date-tree-last)
(end-of-line)
(org-insert-heading '(4) t)
(org-do-demote))
(t
(outline-next-heading)
(org-back-over-empty-lines)
(unless (looking-at "[ \t]*$") (save-excursion (insert "\n")))
(org-insert-heading nil t)
(org-do-demote)))
(let ((col (current-column)))
(insert text)
(org-end-of-meta-data)