GNU bug report logs - #38599
27.0.50; org-agenda lists invalid Diary entries

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38599 in the body.
You can then email your comments to 38599 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thomas Fitzsimmons <fitzsim <at> fitzsim.org>
To: bug-gnu-emacs <at> gnu.org
Cc: Justin Abrahms <justin <at> abrah.ms>
Subject: 27.0.50; org-agenda lists invalid Diary entries
Date: Fri, 13 Dec 2019 17:14:16 -0500

[Message part 1 (text/plain, inline)]

Hi,

Justin reported to me a bug he found while using Excorporate.

In Justin's setup, Excorporate retrieves meeting details from a server
then writes them to a Diary file.  Org agenda reads from that Diary
file.

In the failing case, the meeting details happened to contain lines whose
middles matched diary-time-regexp, e.g. any URL containing 0-9 and then
'h'.  Those non-entry lines were displayed as Diary: entries in the Org
agenda, when they shouldn't have been.

Justin confirmed the attached patch fixes the problem for him.  Can an
Org mode maintainer review it?

Thanks,
Thomas

[0001-Fix-time-regexp-in-org-get-entries-from-diary.patch (text/x-diff, inline)]

From 938be223a8bfd75df61a703d392d2154b6c479c4 Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim <at> fitzsim.org>
Date: Fri, 13 Dec 2019 15:57:28 -0500
Subject: [PATCH] Fix time regexp in org-get-entries-from-diary

* lisp/org/org-agenda.el (org-get-entries-from-diary): Make time regular
expression more precise.

Reported-by: Justin Abrahms <justin <at> abrah.ms>
---
 lisp/org/org-agenda.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 2404ca43dc..05c35b8ac3 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -5135,6 +5135,7 @@ org-get-entries-from-diary
 	  (cons 'org-diary-default-entry diary-list-entries-hook))
 	 (diary-file-name-prefix nil) ; turn this feature off
 	 (diary-modify-entry-list-string-function 'org-modify-diary-entry-string)
+	 (diary-time-regexp (concat "^" diary-time-regexp))
 	 entries
 	 (org-disable-agenda-to-diary t))
     (save-excursion
-- 
2.24.0

Message #14 received at 38599-done <at> debbugs.gnu.org (full text, mbox):

From: Thomas Fitzsimmons <fitzsim <at> fitzsim.org>
To: 38599-done <at> debbugs.gnu.org
Cc: Justin Abrahms <justin <at> abrah.ms>
Subject: Re: bug#38599: 27.0.50; org-agenda lists invalid Diary entries
Date: Sat, 28 Dec 2019 15:22:11 -0500

Hi,

Thomas Fitzsimmons <fitzsim <at> fitzsim.org> writes:

[...]

> Justin confirmed the attached patch fixes the problem for him.  Can an
> Org mode maintainer review it?

I also reported this upstream to the Org maintainers and they accepted
the fix.  Org 9.3.1, which contains the fix, has been released.  You can
install it from GNU ELPA.  I'm marking this bug as done.

Thomas

Message #17 received at 38599-done <at> debbugs.gnu.org (full text, mbox):

From: "Justin Abrahms" <justin <at> abrah.ms>
To: "Thomas Fitzsimmons" <fitzsim <at> fitzsim.org>, 38599-done <at> debbugs.gnu.org
Subject: Re: bug#38599: 27.0.50; org-agenda lists invalid Diary entries
Date: Sat, 28 Dec 2019 12:51:00 -0800

[Message part 1 (text/plain, inline)]

Thank you so much!

On Sat, Dec 28, 2019, at 12:22 PM, Thomas Fitzsimmons wrote:
> Hi,
> 
> Thomas Fitzsimmons <fitzsim <at> fitzsim.org> writes:
> 
> [...]
> 
> > Justin confirmed the attached patch fixes the problem for him. Can an
> > Org mode maintainer review it?
> 
> I also reported this upstream to the Org maintainers and they accepted
> the fix. Org 9.3.1, which contains the fix, has been released. You can
> install it from GNU ELPA. I'm marking this bug as done.
> 
> Thomas
> 

[Message part 2 (text/html, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.