Przeglądaj źródła

Revert "Stop generating superfluous clock entries"

This reverts commit 364054fa77f9a3c182f1519eb3d60a7f0a9dc72c.

Conflicts:

	lisp/ChangeLog
Carsten Dominik 15 lat temu
rodzic
commit
b48dd133dc
2 zmienionych plików z 0 dodań i 11 usunięć
  1. 0 3
      lisp/ChangeLog
  2. 0 8
      lisp/org-clock.el

+ 0 - 3
lisp/ChangeLog

@@ -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

+ 0 - 8
lisp/org-clock.el

@@ -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))