From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Joe Vornehm Jr." Subject: [PATCH] Fix regexps in org-clock.el Date: Sat, 31 Dec 2011 02:34:03 -0500 Message-ID: <4EFEBAEB.2090808@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------030302060204060409010502" Return-path: Received: from eggs.gnu.org ([140.186.70.92]:35365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgtSE-0003G5-6z for emacs-orgmode@gnu.org; Sat, 31 Dec 2011 02:34:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RgtSD-0002vj-3n for emacs-orgmode@gnu.org; Sat, 31 Dec 2011 02:34:10 -0500 Received: from mail-qy0-f169.google.com ([209.85.216.169]:43433) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RgtSD-0002ve-0o for emacs-orgmode@gnu.org; Sat, 31 Dec 2011 02:34:09 -0500 Received: by qcsd17 with SMTP id d17so9881938qcs.0 for ; Fri, 30 Dec 2011 23:34:08 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org This is a multi-part message in MIME format. --------------030302060204060409010502 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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. --------------030302060204060409010502 Content-Type: text/plain; name="0001-Fix-regexps-in-org-clock.el.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Fix-regexps-in-org-clock.el.patch" RnJvbSBjOWQ3NmIxOTFkNjY1ZTUxYWEzY2VhNDJiODZiZWZkYzJmZTQzOTBjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgVm9ybmVobSBKciA8dm9ybmVobUBvcHRpY3Mu cm9jaGVzdGVyLmVkdT4KRGF0ZTogU2F0LCAzMSBEZWMgMjAxMSAwMjowNTo1NSAtMDUwMApT dWJqZWN0OiBbUEFUQ0hdIEZpeCByZWdleHBzIGluIG9yZy1jbG9jay5lbAoKKiBvcmctY2xv Y2suZWwgKG9yZy1jbG9jay1pbik6IFJlbW92ZSBleHRyYW5lb3VzIHNwYWNlIGZyb20gcmVn ZXhwCnVzZWQgdG8gZmluZCBkYW5nbGluZyBjbG9jayBsaW5lcyB3aGVuIHJlc3VtaW5nIGEg Y2xvY2suICBBbHNvIGFwcGx5CmByZWdleHAtcXVvdGUnIHdoZXJlIG9yZy1jbG9jay1zdHJp bmcgaXMgdXNlZCBpbiBhIHJlZ2V4cC4KKG9yZy1jbG9jay1maW5kLXBvc2l0aW9uKTogUmVt b3ZlIGV4dHJhbmVvdXMgc3BhY2UgZnJvbSByZWdleHAgdXNlZCB0bwpmaW5kIGRhbmdsaW5n IGNsb2NrIGxpbmVzIHdoZW4gcmVzdW1pbmcgYSBjbG9jay4gIEFsc28gYXBwbHkKYHJlZ2V4 cC1xdW90ZScgd2hlcmUgb3JnLWNsb2NrLXN0cmluZyBpcyB1c2VkIGluIGEgcmVnZXhwLgoK SSBoYXZlIGJlZW4gc2VlaW5nIGVycm9ycyBvZiAiQ2Fubm90IHJlc3RhcnQgY2xvY2sgYmVj YXVzZSB0YXNrIGRvZXMKbm90IGNvbnRhaW4gdW5maW5pc2hlZCBjbG9jayIgd2hlbiBhdXRv LXJlc3VtaW5nIGEgc2F2ZWQgKHBlcnNpc3RlbnQpCmNsb2NrLiAgRGVsZXRpbmcgdGhlIGV4 dHJhIHNwYWNlIChpbiBgb3JnLWNsb2NrLWluJyBhdCBsZWFzdCkgcHV0cyBhbgplbmQgdG8g dGhlc2UgZXJyb3JzLgoKVElOWUNIQU5HRQotLS0KIGxpc3Avb3JnLWNsb2NrLmVsIHwgICAg NiArKystLS0KIDEgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLWNsb2NrLmVsIGIvbGlzcC9vcmctY2xvY2su ZWwKaW5kZXggYjI5ZjQ3Yi4uN2FkNzZkNSAxMDA2NDQKLS0tIGEvbGlzcC9vcmctY2xvY2su ZWwKKysrIGIvbGlzcC9vcmctY2xvY2suZWwKQEAgLTExMTUsNyArMTExNSw3IEBAIHRoZSBj bG9ja2luZyBzZWxlY3Rpb24sIGFzc29jaWF0ZWQgd2l0aCB0aGUgbGV0dGVyIGBkJy4iCiAJ ICAgIChjb25kCiAJICAgICAoKGFuZCBvcmctY2xvY2staW4tcmVzdW1lCiAJCSAgIChsb29r aW5nLWF0Ci0JCSAgICAoY29uY2F0ICJeWyBcdF0qICIgb3JnLWNsb2NrLXN0cmluZworCQkg ICAgKGNvbmNhdCAiXlsgXHRdKiIgKHJlZ2V4cC1xdW90ZSBvcmctY2xvY2stc3RyaW5nKQog CQkJICAgICIgXFxbXFwoWzAtOV1cXHs0XFx9LVswLTldXFx7MlxcfS1bMC05XVxcezJcXH0i CiAJCQkgICAgIiAqXFxzdytcLj8gK1swMTJdWzAtOV06WzAtNV1bMC05XVxcKVxcXVsgXHRd KiQiKSkpCiAJICAgICAgKG1lc3NhZ2UgIk1hdGNoZWQgJXMiIChtYXRjaC1zdHJpbmcgMSkp CkBAIC0xMjM5LDcgKzEyMzksNyBAQCBsaW5lIGFuZCBwb3NpdGlvbiBjdXJzb3IgaW4gdGhh dCBsaW5lLiIKIAkJICAob3IgKGJvbHApIChuZXdsaW5lKSkKIAkJICAocG9pbnQpKSkKIAkg ICAoZW5kIChwcm9nbiAob3V0bGluZS1uZXh0LWhlYWRpbmcpIChwb2ludCkpKQotCSAgIChy ZSAoY29uY2F0ICJeWyBcdF0qIiBvcmctY2xvY2stc3RyaW5nKSkKKwkgICAocmUgKGNvbmNh dCAiXlsgXHRdKiIgKHJlZ2V4cC1xdW90ZSBvcmctY2xvY2stc3RyaW5nKSkpCiAJICAgKGNu dCAwKQogCSAgIChkcmF3ZXIgKGlmIChzdHJpbmdwIG9yZy1jbG9jay1pbnRvLWRyYXdlcikK IAkJICAgICAgIG9yZy1jbG9jay1pbnRvLWRyYXdlciAiTE9HQk9PSyIpKQpAQCAtMTI0Nyw3 ICsxMjQ3LDcgQEAgbGluZSBhbmQgcG9zaXRpb24gY3Vyc29yIGluIHRoYXQgbGluZS4iCiAg ICAgICAoZ290by1jaGFyIGJlZykKICAgICAgICh3aGVuIChhbmQgZmluZC11bmNsb3NlZAog CQkgKHJlLXNlYXJjaC1mb3J3YXJkCi0JCSAgKGNvbmNhdCAiXlsgXHRdKiAiIG9yZy1jbG9j ay1zdHJpbmcKKwkJICAoY29uY2F0ICJeWyBcdF0qIiAocmVnZXhwLXF1b3RlIG9yZy1jbG9j ay1zdHJpbmcpCiAJCQkgICIgXFxbXFwoWzAtOV1cXHs0XFx9LVswLTldXFx7MlxcfS1bMC05 XVxcezJcXH0iCiAJCQkgICIgKlxcc3crICtbMDEyXVswLTldOlswLTVdWzAtOV1cXClcXF1b IFx0XSokIikKIAkJICBlbmQgdCkpCi0tIAoxLjcuNS4xCgo= --------------030302060204060409010502--