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

Revert "Stop generating superfluous clock entries" 

This reverts commit 364054fa77.

Conflicts:

	lisp/ChangeLog
This commit is contained in:
Carsten Dominik 2009-11-27 23:28:04 +01:00
parent 661a8855d3
commit b48dd133dc
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -7,9 +7,6 @@
with an invisible character.
(org-additional-option-like-keywords): Add LaTeX_CLASS_OPTIONS.
* org-clock.el (org-clock-in): Do not restart the clock in the
same entry where it is running now.
2009-11-26 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-normalize): Don't take optional

8
lisp/org-clock.el
View File

@ -850,14 +850,6 @@ the clocking selection, associated with the letter `d'."
(when interrupting
;; We are interrupting the clocking of a different task.
;; Save a marker to this task, so that we can go back.
;; First check if we are trying to clock into the same task!
(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))))
(message "Clock continues in \"%s\"" org-clock-heading)
(throw 'abort nil))
(move-marker org-clock-interrupted-task
(marker-position org-clock-marker)
(marker-buffer org-clock-marker))