[PATCH] org-agenda: fix regexp in progress for state logging

[PATCH] org-agenda: fix regexp in progress for state logging

[Julien Danjou]

* org-agenda.el (org-agenda-get-progress): Fix regexp for statep: it
must has \\ at the end of the line. This avoid matching the following
heading when there's no newline between the logged state and the next
heading.

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 lisp/org-agenda.el |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3c1104e..6e8d07a 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4814,15 +4814,15 @@ be skipped."
 		     (setq clocked (match-string 2 rest)))
 	    (setq clocked "-")))
 	(save-excursion
-	  (setq extra nil)
-	  (cond
-	   ((not org-agenda-log-mode-add-notes))
-	   (statep
-	    (and (looking-at ".*\n[ \t]*\\([^-\n \t].*?\\)[ \t]*$")
-		 (setq extra (match-string 1))))
-	   (clockp
-	    (and (looking-at ".*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$")
-		 (setq extra (match-string 1)))))
+	  (setq extra
+		(cond
+		 ((not org-agenda-log-mode-add-notes) nil)
+		 (statep
+		  (and (looking-at ".*\\\\\n[ \t]*\\([^-\n \t].*?\\)[ \t]*$")
+		       (match-string 1)))
+		 (clockp
+		  (and (looking-at ".*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$")
+		       (match-string 1)))))
 	  (if (not (re-search-backward "^\\*+ " nil t))
 	      (setq txt org-agenda-no-heading-message)
 	    (goto-char (match-beginning 0))
-- 
1.7.2.3

Re: [PATCH] org-agenda: fix regexp in progress for state logging

[Giovanni Ridolfi]

Julien Danjou <julien@danjou.info> writes:

Hi, Julien
> * org-agenda.el (org-agenda-get-progress): Fix regexp for statep: 
> it must has \\ at the end of the line. This avoid matching the following
  it must have ?

cheers
Giovanni

Re: [PATCH] org-agenda: fix regexp in progress for state logging

[Julien Danjou]

[-- Attachment #1.1: Type: text/plain, Size: 369 bytes --]

On Wed, Jan 26 2011, Giovanni Ridolfi wrote:

> Julien Danjou <julien@danjou.info> writes:
>
> Hi, Julien
>> * org-agenda.el (org-agenda-get-progress): Fix regexp for statep: 
>> it must has \\ at the end of the line. This avoid matching the following
>   it must have ?

Yes, sorry, that's not a catz. :)

-- 
Julien Danjou
❱ http://julien.danjou.info

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 201 bytes --]

_______________________________________________
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

[Accepted] org-agenda: fix regexp in progress for state logging

[Bastien Guerry]

Patch 562 (http://patchwork.newartisans.com/patch/562/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C1296057132-14557-1-git-send-email-julien%40danjou.info%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [Orgmode] org-agenda: fix regexp in progress for state logging
> Date: Wed, 26 Jan 2011 20:52:12 -0000
> From: Julien Danjou <julien@danjou.info>
> X-Patchwork-Id: 562
> Message-Id: <1296057132-14557-1-git-send-email-julien@danjou.info>
> To: emacs-orgmode@gnu.org
> Cc: Julien Danjou <julien@danjou.info>
> 
> * org-agenda.el (org-agenda-get-progress): Fix regexp for statep: it
> must has \\ at the end of the line. This avoid matching the following
> heading when there's no newline between the logged state and the next
> heading.
> 
> Signed-off-by: Julien Danjou <julien@danjou.info>
> 
> ---
> lisp/org-agenda.el |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index 3c1104e..6e8d07a 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -4814,15 +4814,15 @@ be skipped."
>  		     (setq clocked (match-string 2 rest)))
>  	    (setq clocked "-")))
>  	(save-excursion
> -	  (setq extra nil)
> -	  (cond
> -	   ((not org-agenda-log-mode-add-notes))
> -	   (statep
> -	    (and (looking-at ".*\n[ \t]*\\([^-\n \t].*?\\)[ \t]*$")
> -		 (setq extra (match-string 1))))
> -	   (clockp
> -	    (and (looking-at ".*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$")
> -		 (setq extra (match-string 1)))))
> +	  (setq extra
> +		(cond
> +		 ((not org-agenda-log-mode-add-notes) nil)
> +		 (statep
> +		  (and (looking-at ".*\\\\\n[ \t]*\\([^-\n \t].*?\\)[ \t]*$")
> +		       (match-string 1)))
> +		 (clockp
> +		  (and (looking-at ".*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$")
> +		       (match-string 1)))))
>  	  (if (not (re-search-backward "^\\*+ " nil t))
>  	      (setq txt org-agenda-no-heading-message)
>  	    (goto-char (match-beginning 0))
>