mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

Revert "Revert "Fix clocking to allow again selection of a task in the history""

Browse Source 
This reverts commit 702708463f.
This commit is contained in:
Carsten Dominik 2009-11-27 23:23:16 +01:00
parent 702708463f
commit 5e41177c2e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -1,5 +1,8 @@
2009-11-27 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-in): Fix current task detection when a
task is selected from the clock history.
* org-latex.el (org-export-latex-class-options): New variable.
(org-export-latex-set-initial-vars): Use the class options.

9
lisp/org-clock.el
View File

@ -854,8 +854,13 @@ the clocking selection, associated with the letter `d'."
(when (save-excursion
(org-back-to-heading t)
(and (equal (marker-buffer org-clock-hd-marker)
(current-buffer))
(= (marker-position org-clock-hd-marker) (point))))
(if selected-task
(marker-buffer selected-task)
(current-buffer)))
(= (marker-position org-clock-hd-marker)
(if selected-task
(marker-position selected-task)
(point)))))
(message "Clock continues in \"%s\"" org-clock-heading)
(throw 'abort nil))
(move-marker org-clock-interrupted-task