Fix for clocking in when org-clock-into-drawer is not a string

Fix for clocking in when org-clock-into-drawer is not a string

[Tom Hinton]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

Hello,

I have encountered a fault in recent versions of org when clocking into a task with a dangling clock when
org-clock-into-drawer is an integer rather than a string. It appears the error was a presumption that
org-clock-into-drawer would be a string for the construction of a regex. Attached is a trivial single line patch
which seems to fix this for me. make test reports no additional test failures with the patch applied.

All the best,

Tom Hinton


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-clock-in-when-org-clock-into-drawer-is-integer.patch --]
[-- Type: text/x-diff, Size: 1104 bytes --]

From 498b0ae295453e1ce5ef42d54cb8dfb9f930809e Mon Sep 17 00:00:00 2001
From: Tom Hinton <tom.hinton@cse.org.uk>
Date: Wed, 12 Aug 2015 12:46:47 +0100
Subject: [PATCH] Fix clock in when org-clock-into-drawer is integer

* org-clock.el (org-clock-jump-to-current-clock):
  fixed a bug wherein org-clock-jump-to-current-clock did not work if org-clock-into-drawer
  was not either a string or nil.

This is a TINYCHANGE, although I am happy to assign copyright to the FSF.
---
 lisp/org-clock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index e44da73..6de093f 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -950,7 +950,7 @@ If necessary, clock-out of the currently active clock."
       (when drawer
 	(org-with-wide-buffer
 	 (let ((drawer-re (format "^[ \t]*:%s:[ \t]*$"
-				  (regexp-quote (or drawer "LOGBOOK"))))
+				  (regexp-quote (if (stringp drawer) drawer "LOGBOOK"))))
 	       (beg (save-excursion (outline-back-to-heading t) (point))))
 	   (catch 'exit
 	     (while (re-search-backward drawer-re beg t)
-- 
2.1.4


[-- Attachment #3: Type: text/plain, Size: 52 bytes --]

-- 
http://www.cse.org.uk/about-us/staff#Tom-Hinton

Re: Fix for clocking in when org-clock-into-drawer is not a string

[Nicolas Goaziou]

Hello,

Tom Hinton <tom.hinton@cse.org.uk> writes:

> From 498b0ae295453e1ce5ef42d54cb8dfb9f930809e Mon Sep 17 00:00:00 2001
> From: Tom Hinton <tom.hinton@cse.org.uk>
> Date: Wed, 12 Aug 2015 12:46:47 +0100
> Subject: [PATCH] Fix clock in when org-clock-into-drawer is integer
>
> * org-clock.el (org-clock-jump-to-current-clock):
>   fixed a bug wherein org-clock-jump-to-current-clock did not work if org-clock-into-drawer
>   was not either a string or nil.

Applied. Thank you.

> This is a TINYCHANGE, although I am happy to assign copyright to the
> FSF.

It will help for future patches. See
http://orgmode.org/worg/org-contribute.html if you need directions.


Regards,

-- 
Nicolas Goaziou

Fix for clocking in when org-clock-into-drawer is not a string

[Tom Hinton]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

Hello,

I have encountered a fault in recent versions of org when clocking into a task with a dangling clock when org-clock-into-drawer is an integer rather than a string. It appears the error was a presumption that org-clock-into-drawer would be a string for the construction of a regex. Attached is a trivial single line patch which seems to fix this for me. make test reports no additional test failures with the patch applied.

All the best,

Tom Hinton


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-clock-in-when-org-clock-into-drawer-is-integer.patch --]
[-- Type: text/x-diff, Size: 1104 bytes --]

From 498b0ae295453e1ce5ef42d54cb8dfb9f930809e Mon Sep 17 00:00:00 2001
From: Tom Hinton <tom.hinton@cse.org.uk>
Date: Wed, 12 Aug 2015 12:46:47 +0100
Subject: [PATCH] Fix clock in when org-clock-into-drawer is integer

* org-clock.el (org-clock-jump-to-current-clock):
  fixed a bug wherein org-clock-jump-to-current-clock did not work if org-clock-into-drawer
  was not either a string or nil.

This is a TINYCHANGE, although I am happy to assign copyright to the FSF.
---
 lisp/org-clock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index e44da73..6de093f 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -950,7 +950,7 @@ If necessary, clock-out of the currently active clock."
       (when drawer
 	(org-with-wide-buffer
 	 (let ((drawer-re (format "^[ \t]*:%s:[ \t]*$"
-				  (regexp-quote (or drawer "LOGBOOK"))))
+				  (regexp-quote (if (stringp drawer) drawer "LOGBOOK"))))
 	       (beg (save-excursion (outline-back-to-heading t) (point))))
 	   (catch 'exit
 	     (while (re-search-backward drawer-re beg t)
-- 
2.1.4


[-- Attachment #3: Type: text/plain, Size: 53 bytes --]


-- 
http://www.cse.org.uk/about-us/staff#Tom-Hinton

Re: Fix for clocking in when org-clock-into-drawer is not a string

[Bastien Guerry]

Hi Tom,

I see this has been committed, thanks!

-- 
 Bastien