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

Merge branch 'master' of git://repo.or.cz/org-mode

This commit is contained in:
Dan Davison 2010-04-19 16:08:44 -04:00
parent 1dd6dd3bd7 e60353004c
commit 8b8f687dcb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2010-04-19 Bastien Guerry <bzg@altern.org>
* org-clock.el (org-clock-set-current): Just return the headline
itself, strip the TODO keyword, the priority cookie and the tags.
2010-04-18 Carsten Dominik <carsten.dominik@gmail.com> 2010-04-18 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-as-html-and-open): Add argument to * org-html.el (org-export-as-html-and-open): Add argument to

2
lisp/org-clock.el
View File

@ -1058,7 +1058,7 @@ the clocking selection, associated with the letter `d'."
"Task currently clocked in.") "Task currently clocked in.")
(defun org-clock-set-current () (defun org-clock-set-current ()
"Set `org-clock-current-task' to the task currently clocked in." "Set `org-clock-current-task' to the task currently clocked in."
(setq org-clock-current-task (org-get-heading))) (setq org-clock-current-task (nth 4 (org-heading-components))))
(defun org-clock-delete-current () (defun org-clock-delete-current ()
"Reset `org-clock-current-task' to nil." "Reset `org-clock-current-task' to nil."
(setq org-clock-current-task nil)) (setq org-clock-current-task nil))