* [PATCH] Fix regexps in org-clock.el
@ 2011-12-31 7:34 Joe Vornehm Jr.
2011-12-31 8:06 ` Carsten Dominik
0 siblings, 1 reply; 3+ messages in thread
From: Joe Vornehm Jr. @ 2011-12-31 7:34 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 780 bytes --]
I have been seeing persistent errors of "Cannot restart clock because task does not contain unfinished clock" when auto-resuming a saved (persistent) clock. I believe I've tracked the error down to an extraneous space in a regexp ("^[ \t]* " when it should be "^[ \t]*").
This patch fixes the issue for me (in `org-clock-in'), and it makes the same change in `org-clock-find-position'. I've tested this briefly and it works for me; nothing about clocking-in behavior seems to break, and persistent clocks work now.
I've also wrapped `regexp-quote' around instances where org-clock-string is used to build a regexp, in case someone puts funny characters in their org-clock-string.
Hopefully, the patch is attached correctly and Thunderbird didn't mangle it.
Cheers!
Joe V.
[-- Attachment #2: 0001-Fix-regexps-in-org-clock.el.patch --]
[-- Type: text/plain, Size: 2195 bytes --]
From c9d76b191d665e51aa3cea42b86befdc2fe4390c Mon Sep 17 00:00:00 2001
From: Joe Vornehm Jr <vornehm@optics.rochester.edu>
Date: Sat, 31 Dec 2011 02:05:55 -0500
Subject: [PATCH] Fix regexps in org-clock.el
* org-clock.el (org-clock-in): Remove extraneous space from regexp
used to find dangling clock lines when resuming a clock. Also apply
`regexp-quote' where org-clock-string is used in a regexp.
(org-clock-find-position): Remove extraneous space from regexp used to
find dangling clock lines when resuming a clock. Also apply
`regexp-quote' where org-clock-string is used in a regexp.
I have been seeing errors of "Cannot restart clock because task does
not contain unfinished clock" when auto-resuming a saved (persistent)
clock. Deleting the extra space (in `org-clock-in' at least) puts an
end to these errors.
TINYCHANGE
---
lisp/org-clock.el | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index b29f47b..7ad76d5 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1115,7 +1115,7 @@ the clocking selection, associated with the letter `d'."
(cond
((and org-clock-in-resume
(looking-at
- (concat "^[ \t]* " org-clock-string
+ (concat "^[ \t]*" (regexp-quote org-clock-string)
" \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}"
" *\\sw+\.? +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$")))
(message "Matched %s" (match-string 1))
@@ -1239,7 +1239,7 @@ line and position cursor in that line."
(or (bolp) (newline))
(point)))
(end (progn (outline-next-heading) (point)))
- (re (concat "^[ \t]*" org-clock-string))
+ (re (concat "^[ \t]*" (regexp-quote org-clock-string)))
(cnt 0)
(drawer (if (stringp org-clock-into-drawer)
org-clock-into-drawer "LOGBOOK"))
@@ -1247,7 +1247,7 @@ line and position cursor in that line."
(goto-char beg)
(when (and find-unclosed
(re-search-forward
- (concat "^[ \t]* " org-clock-string
+ (concat "^[ \t]*" (regexp-quote org-clock-string)
" \\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}"
" *\\sw+ +[012][0-9]:[0-5][0-9]\\)\\][ \t]*$")
end t))
--
1.7.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix regexps in org-clock.el
2011-12-31 7:34 [PATCH] Fix regexps in org-clock.el Joe Vornehm Jr.
@ 2011-12-31 8:06 ` Carsten Dominik
2011-12-31 23:21 ` Joe Vornehm Jr.
0 siblings, 1 reply; 3+ messages in thread
From: Carsten Dominik @ 2011-12-31 8:06 UTC (permalink / raw)
To: Joe Vornehm Jr.; +Cc: emacs-orgmode
Applied, thanks.
But I have removed the regexp-quote again, because org-clock-string
is used in many more regexps, and a more complete patch would be
needed to make this change meaningful.
- Carsten
On 31.12.2011, at 08:34, Joe Vornehm Jr. wrote:
> I have been seeing persistent errors of "Cannot restart clock because task does not contain unfinished clock" when auto-resuming a saved (persistent) clock. I believe I've tracked the error down to an extraneous space in a regexp ("^[ \t]* " when it should be "^[ \t]*").
>
> This patch fixes the issue for me (in `org-clock-in'), and it makes the same change in `org-clock-find-position'. I've tested this briefly and it works for me; nothing about clocking-in behavior seems to break, and persistent clocks work now.
>
> I've also wrapped `regexp-quote' around instances where org-clock-string is used to build a regexp, in case someone puts funny characters in their org-clock-string.
>
> Hopefully, the patch is attached correctly and Thunderbird didn't mangle it.
>
> Cheers!
> Joe V.
>
>
> <0001-Fix-regexps-in-org-clock.el.patch>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix regexps in org-clock.el
2011-12-31 8:06 ` Carsten Dominik
@ 2011-12-31 23:21 ` Joe Vornehm Jr.
0 siblings, 0 replies; 3+ messages in thread
From: Joe Vornehm Jr. @ 2011-12-31 23:21 UTC (permalink / raw)
To: Carsten Dominik; +Cc: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 1368 bytes --]
Thanks -- understood. I checked org-clock.el for uses of org-clock-string
in regexps but failed to check other files.
Joe V.
On Sat, Dec 31, 2011 at 3:06 AM, Carsten Dominik
<carsten.dominik@gmail.com>wrote:
> Applied, thanks.
>
> But I have removed the regexp-quote again, because org-clock-string
> is used in many more regexps, and a more complete patch would be
> needed to make this change meaningful.
>
> - Carsten
>
> On 31.12.2011, at 08:34, Joe Vornehm Jr. wrote:
>
> > I have been seeing persistent errors of "Cannot restart clock because
> task does not contain unfinished clock" when auto-resuming a saved
> (persistent) clock. I believe I've tracked the error down to an extraneous
> space in a regexp ("^[ \t]* " when it should be "^[ \t]*").
> >
> > This patch fixes the issue for me (in `org-clock-in'), and it makes the
> same change in `org-clock-find-position'. I've tested this briefly and it
> works for me; nothing about clocking-in behavior seems to break, and
> persistent clocks work now.
> >
> > I've also wrapped `regexp-quote' around instances where org-clock-string
> is used to build a regexp, in case someone puts funny characters in their
> org-clock-string.
> >
> > Hopefully, the patch is attached correctly and Thunderbird didn't mangle
> it.
> >
> > Cheers!
> > Joe V.
> >
> >
> > <0001-Fix-regexps-in-org-clock.el.patch>
>
>
[-- Attachment #2: Type: text/html, Size: 1819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-31 23:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-31 7:34 [PATCH] Fix regexps in org-clock.el Joe Vornehm Jr.
2011-12-31 8:06 ` Carsten Dominik
2011-12-31 23:21 ` Joe Vornehm Jr.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).