ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The note buffer for clocking out now mentions the task.

This commit is contained in:
Carsten Dominik 2008-09-07 08:29:16 +02:00
parent d276209c49
commit f03ea46b3a
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ORGWEBPAGE/Changes.org
View File

@ -32,6 +32,10 @@
** Details
*** The note buffer for clocking out now mentions the task
This was a request by Peter Frings.
*** Secondary filtering of agenda views.
You can now easily and interactively filter an existing

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2008-09-07 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-log-note-extra): New variable.
2008-09-05 Bastien Guerry <bzg@altern.org>
* org.el (org-additional-option-like-keywords): Added keywords for

3
lisp/org-clock.el
View File

@ -368,7 +368,8 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set."
(delete-char 1)))
(move-marker org-clock-marker nil)
(when org-log-note-clock-out
(org-add-log-setup 'clock-out))
(org-add-log-setup 'clock-out nil nil nil
(concat "# Task: " (org-get-heading t) "\n\n")))
(when org-mode-line-timer
(cancel-timer org-mode-line-timer)
(setq org-mode-line-timer nil))

12
lisp/org.el
View File

@ -8747,6 +8747,7 @@ Returns the new TODO keyword, or nil if no state change should occur."
(defvar org-log-post-message)
(defvar org-log-note-purpose)
(defvar org-log-note-how)
(defvar org-log-note-extra)
(defun org-auto-repeat-maybe (done-word)
"Check if the current headline contains a repeated deadline/schedule.
If yes, set TODO state back to what it was and change the base date
@ -8985,6 +8986,7 @@ be removed."
(defvar org-log-note-purpose nil)
(defvar org-log-note-state nil)
(defvar org-log-note-how nil)
(defvar org-log-note-extra nil)
(defvar org-log-note-window-configuration nil)
(defvar org-log-note-return-to (make-marker))
(defvar org-log-post-message nil
@ -8997,11 +8999,13 @@ This is done in the same way as adding a state change note."
(interactive)
(org-add-log-setup 'note nil t nil))
(defun org-add-log-setup (&optional purpose state findpos how)
(defun org-add-log-setup (&optional purpose state findpos how extra)
"Set up the post command hook to take a note.
If this is about to TODO state change, the new state is expected in STATE.
When FINDPOS is non-nil, find the correct position for the note in
the current entry. If not, assume that it can be inserted at point."
the current entry. If not, assume that it can be inserted at point.
HOW is an indicator what kind of note should be created.
EXTRA is additional text that will be inserted into the notes buffer."
(save-excursion
(when findpos
(org-back-to-heading t)
@ -9016,7 +9020,8 @@ the current entry. If not, assume that it can be inserted at point."
(move-marker org-log-note-marker (point))
(setq org-log-note-purpose purpose
org-log-note-state state
org-log-note-how how)
org-log-note-how how
org-log-note-extra extra)
(add-hook 'post-command-hook 'org-add-log-note 'append)))
(defun org-skip-over-state-notes ()
@ -9050,6 +9055,7 @@ the current entry. If not, assume that it can be inserted at point."
((eq org-log-note-purpose 'note)
"this entry")
(t (error "This should not happen")))))
(if org-log-note-extra (insert org-log-note-extra))
(org-set-local 'org-finish-function 'org-store-log-note)))
(defvar org-note-abort nil) ; dynamically scoped