bug#38599: 27.0.50; org-agenda lists invalid Diary entries

bug#38599: 27.0.50; org-agenda lists invalid Diary entries

[Thomas Fitzsimmons]

[-- Attachment #1: Type: text/plain, Size: 590 bytes --]

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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-time-regexp-in-org-get-entries-from-diary.patch --]
[-- Type: text/x-diff, Size: 963 bytes --]

From 938be223a8bfd75df61a703d392d2154b6c479c4 Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@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@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

bug#38599: 27.0.50; org-agenda lists invalid Diary entries

[Thomas Fitzsimmons]

Hi,

Thomas Fitzsimmons <fitzsim@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

bug#38599: 27.0.50; org-agenda lists invalid Diary entries

[Justin Abrahms]

[-- Attachment #1: Type: text/plain, Size: 485 bytes --]

Thank you so much!

On Sat, Dec 28, 2019, at 12:22 PM, Thomas Fitzsimmons wrote:
> Hi,
> 
> Thomas Fitzsimmons <fitzsim@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
> 

[-- Attachment #2: Type: text/html, Size: 923 bytes --]