0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-29 14:02:57 +00:00
org-mode/lisp
Carsten Dominik 4020e2a8c4 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)
2009-10-01 20:01:01 +02:00
..
ChangeLog Fix bug in canceling clocks 2009-10-01 20:01:01 +02:00
ChangeLog.01 Split ChangeLog file into parts. 2008-05-08 08:16:38 +02:00
org-agenda.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-archive.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-ascii.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-attach.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-bbdb.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-bibtex.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-clock.el Fix bug in canceling clocks 2009-10-01 20:01:01 +02:00
org-colview-xemacs.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-colview.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-compat.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-crypt.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-docbook.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-exp-blocks.el Apply fixes from downstream Emacs 2009-09-30 09:20:28 +02:00
org-exp.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-faces.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-feed.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-footnote.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-gnus.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-html.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-icalendar.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-id.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-indent.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-info.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-inlinetask.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-irc.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-jsinfo.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-latex.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-list.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-mac-message.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-macs.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-mew.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-mhe.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-mobile.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-mouse.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-plot.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-protocol.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-publish.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-remember.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-rmail.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-src.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-table.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-timer.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-vm.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-w3m.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-wl.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org-xoxo.el Push version number to 6.31trans 2009-10-01 11:57:17 +02:00
org.el Allow date to be shifted into the future if time is earlier than now 2009-10-01 12:53:16 +02:00