From 4020e2a8c4fe654fd4de4803e5daf2c7dc40fc0f Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Thu, 1 Oct 2009 20:01:01 +0200 Subject: [PATCH] Fix bug in canceling clocks Peter Frings writes: > Clocking in on any task (C-c C-x C-i) and cancelling afterwards (C-c C-x > C-x) results in the following backtrace: > ,---- > | Debugger entered--Lisp error: (wrong-type-argument markerp org-clock-marker) > | move-marker(org-clock-marker nil) > | org-clock-cancel() > | call-interactively(org-clock-cancel nil nil) > `---- > Culprit are two erroneous quotes in front of org-clock-marker in org-clock-el. The patch (output > of git diff -u on a clean checkout) fixes the problem: > > diff --git a/lisp/org-clock.el b/lisp/org-clock.el > index e279898..91a4bcb 100644 > --- a/lisp/org-clock.el > +++ b/lisp/org-clock.el > @@ -818,8 +818,8 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set." > (set-buffer (marker-buffer org-clock-marker)) > (goto-char org-clock-marker) > (delete-region (1- (point-at-bol)) (point-at-eol))) > - (move-marker 'org-clock-marker nil) > - (move-marker 'org-clock-hd-marker nil) > + (move-marker org-clock-marker nil) > + (move-marker org-clock-hd-marker nil) > (setq global-mode-string > (delq 'org-mode-line-string global-mode-string)) > (force-mode-line-update) --- lisp/ChangeLog | 3 +++ lisp/org-clock.el | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed064a414..68d9d7810 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-10-01 Carsten Dominik + * org-clock.el (org-clock-cancel): Remove quotes from marker + variables. + * org.el (org-read-date-prefer-future): New allowed value `time'. (org-read-date-analyze): Shift day to tomorrow depending on time entered and value of `org-read-date-prefer-future'. diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 28e266fad..0aba27aea 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -818,8 +818,8 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set." (set-buffer (marker-buffer org-clock-marker)) (goto-char org-clock-marker) (delete-region (1- (point-at-bol)) (point-at-eol))) - (move-marker 'org-clock-marker nil) - (move-marker 'org-clock-hd-marker nil) + (move-marker org-clock-marker nil) + (move-marker org-clock-hd-marker nil) (setq global-mode-string (delq 'org-mode-line-string global-mode-string)) (force-mode-line-update) -- 2.11.4.GIT