Bläddra i källkod

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

Carsten Dominik 15 år sedan
förälder
incheckning
c59c2b791d
2 ändrade filer med 10 tillägg och 2 borttagningar
  1. 3 0
      lisp/ChangeLog
  2. 7 2
      lisp/org-clock.el

+ 3 - 0
lisp/ChangeLog

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

+ 7 - 2
lisp/org-clock.el

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