From c490fe784a8a3d91dd3011506f959ff5872f3227 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Sat, 26 Apr 2008 07:03:19 +0200 Subject: [PATCH] Bug fix for clock history. Now it is possible to select also the current clocking task after pressing C-u C-c C-x C-i. What will happen then is that this entry will be clocked out, and then clocked in again. --- lisp/org-clock.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 92e01b270..6f8a99a15 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -209,16 +209,16 @@ the clocking selection, associated with the letter `d'." ts selected-task) (when (equal select '(4)) (setq selected-task (org-clock-select-task "Clock-in on task: ")) - (or selected-task - (error "Abort"))) + (if selected-task + (setq selected-task (copy-marker selected-task)) + (error "Abort"))) ;; Are we interrupting the clocking of a differnt task? (if interrupting (progn (move-marker org-clock-interrupted-task (marker-position org-clock-marker) (marker-buffer org-clock-marker)) - (let ((org-clock-inhibit-clock-restart t)) - (org-clock-out t)))) + (org-clock-out t))) (when (equal select '(16)) (save-excursion @@ -229,7 +229,8 @@ the clocking selection, associated with the letter `d'." (org-back-to-heading t) (when (and selected-task (marker-buffer selected-task)) (set-buffer (marker-buffer selected-task)) - (goto-char selected-task)) + (goto-char selected-task) + (move-marker selected-task nil)) (or interrupting (move-marker org-clock-interrupted-task nil)) (org-clock-history-push) (when (and org-clock-in-switch-to-state