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 <jul...@danjou.info> > X-Patchwork-Id: 562 > Message-Id: <1296057132-14557-1-git-send-email-jul...@danjou.info> > To: emacs-orgmode@gnu.org > Cc: Julien Danjou <jul...@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 <jul...@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)) > _______________________________________________ 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
