From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [PATCH] org-clock.el: fix regex to recognize indented clock tables Date: Tue, 16 Nov 2010 10:23:19 +0100 Message-ID: References: <87wroe2n35.fsf@Rainer.invalid> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=57508 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIHl7-0000YV-V2 for emacs-orgmode@gnu.org; Tue, 16 Nov 2010 04:23:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIHl5-00020V-Ja for emacs-orgmode@gnu.org; Tue, 16 Nov 2010 04:23:25 -0500 Received: from mail-ey0-f169.google.com ([209.85.215.169]:36557) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIHl5-00020C-Bf for emacs-orgmode@gnu.org; Tue, 16 Nov 2010 04:23:23 -0500 Received: by eydd26 with SMTP id d26so137809eyd.0 for ; Tue, 16 Nov 2010 01:23:21 -0800 (PST) In-Reply-To: <87wroe2n35.fsf@Rainer.invalid> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Achim Gratz Cc: emacs-orgmode@gnu.org Applied, thanks Achim. - Carsten On Nov 16, 2010, at 12:17 AM, Achim Gratz wrote: > > org-clock.el: fix regex to recognize indented clock tables > > * #BEGIN: and #END: were expected only at the first column in some > places. > * #BEGIN: and #END: were erroneously recognized inside normal lines in > other instances. > * always allow whitespace after #BEGIN: and #END:, not just a single > space > > TINYCHANGE - This patch is in the public domain. > > > Achim. > -- > +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ > > SD adaptation for Waldorf rackAttack V1.04R1: > http://Synth.Stromeko.net/Downloads.html#WaldorfSDada > From fa6a2f32a48f295e7b0053637a330d26a505ba8d Mon Sep 17 00:00:00 2001 > From: Achim Gratz > Date: Mon, 15 Nov 2010 23:19:34 +0100 > Subject: [PATCH] org-clock.el: fix regex to recognize indented clock > tables > > * #BEGIN: and #END: were expected only at the first column in some > places. > * #BEGIN: and #END: were erroneously recognized inside normal lines > in other instances. > * always allow whitespace after #BEGIN: and #END:, not just a single > space > > TINYCHANGE - This patch is in the public domain. > --- > lisp/org-clock.el | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/lisp/org-clock.el b/lisp/org-clock.el > index 377c510..3146926 100644 > --- a/lisp/org-clock.el > +++ b/lisp/org-clock.el > @@ -1623,7 +1623,7 @@ fontified, and then returned." > (font-lock-fontify-buffer) > (forward-line 2) > (buffer-substring (point) (progn > - (re-search-forward "^#\\+END" nil t) > + (re-search-forward "^[ \t]+#\\+END" nil t) > (point-at-bol))))) > > (defun org-clock-report (&optional arg) > @@ -1648,9 +1648,9 @@ buffer and update it." > (let ((pos (point)) start) > (save-excursion > (end-of-line 1) > - (and (re-search-backward "^#\\+BEGIN:[ \t]+clocktable" nil t) > + (and (re-search-backward "^[ \t]+#\\+BEGIN:[ \t]+clocktable" > nil t) > (setq start (match-beginning 0)) > - (re-search-forward "^#\\+END:.*" nil t) > + (re-search-forward "^[ \t]+#\\+END:.*" nil t) > (>= (match-end 0) pos) > start)))) > > @@ -1741,7 +1741,7 @@ the currently selected interval size." > (and (memq dir '(left down)) (setq n (- n))) > (save-excursion > (goto-char (point-at-bol)) > - (if (not (looking-at "#\\+BEGIN: clocktable\\>.*?:block[ \t]+\\ > (\\S-+\\)")) > + (if (not (looking-at "^[ \t]+#\\+BEGIN:[ \t]+clocktable\ > \>.*?:block[ \t]+\\(\\S-+\\)")) > (error "Line needs a :block definition before this command works") > (let* ((b (match-beginning 1)) (e (match-end 1)) > (s (match-string 1)) > @@ -2134,7 +2134,7 @@ from the dynamic block defintion." > "Weekly report starting on: ") > (plist-get p1 :tstart) "\n") > (setq step-time (org-dblock-write:clocktable p1)) > - (re-search-forward "#\\+END:") > + (re-search-forward "^[ \t]+#\\+END:") > (when (and (equal step-time 0) stepskip0) > ;; Remove the empty table > (delete-region (point-at-bol) > -- > 1.7.1 > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode - Carsten