From: Julien Danjou <julien@danjou.info>
To: emacs-orgmode@gnu.org
Cc: Julien Danjou <julien@danjou.info>
Subject: [PATCH] org-agenda: fix regexp in progress for state logging
Date: Wed, 26 Jan 2011 16:52:12 +0100 [thread overview]
Message-ID: <1296057132-14557-1-git-send-email-julien@danjou.info> (raw)
* 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
next reply other threads:[~2011-01-26 15:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-26 15:52 Julien Danjou [this message]
2011-01-26 16:15 ` [PATCH] org-agenda: fix regexp in progress for state logging Giovanni Ridolfi
2011-01-26 16:51 ` Julien Danjou
2011-01-26 17:25 ` [Accepted] " Bastien Guerry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296057132-14557-1-git-send-email-julien@danjou.info \
--to=julien@danjou.info \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).