From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Danjou Subject: [PATCH] org-agenda: fix regexp in progress for state logging Date: Wed, 26 Jan 2011 16:52:12 +0100 Message-ID: <1296057132-14557-1-git-send-email-julien@danjou.info> Return-path: Received: from [140.186.70.92] (port=37209 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi7fN-0000pe-AY for emacs-orgmode@gnu.org; Wed, 26 Jan 2011 10:52:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi7fL-0006sB-Q5 for emacs-orgmode@gnu.org; Wed, 26 Jan 2011 10:52:17 -0500 Received: from coquelicot-s.easter-eggs.com ([213.215.37.94]:47844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi7fL-0006rU-JT for emacs-orgmode@gnu.org; Wed, 26 Jan 2011 10:52:15 -0500 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: emacs-orgmode@gnu.org Cc: 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 --- 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