From b1cb3b724a17320f631f4e7ed86d0fee7fbbf686 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Sun, 10 Dec 2023 16:00:19 +0100 Subject: [PATCH] Revert "org-element: Simplify drawer and property drawer regexps" This reverts commit 2b96501070b608117ec62507dbbeab61cbc380d3. The regexp was actually incorrect and correcting it is not trivial. --- lisp/org.el | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 2030f566e..06b2f9099 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -621,14 +621,9 @@ Group 1 contains drawer's name or \"END\".") "Matches an entire LOGBOOK drawer.") (defconst org-property-drawer-re - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63225#62 - (rx - ;; Drawer begin line. - bol (0+ (in " \t")) ":PROPERTIES:" (0+ (in " \t")) "\n" - ;; Node properties. - (*? (0+ (in " \t")) ":" (+ (not (in " \t\n:"))) ":" (* nonl) "\n") - ;; Drawer end line. - (0+ (in " \t")) ":END:" (0+ (in " \t")) eol) + (concat "^[ \t]*:PROPERTIES:[ \t]*\n" + "\\(?:[ \t]*:\\S-+:\\(?:[ \t].*\\)?[ \t]*\n\\)*?" + "[ \t]*:END:[ \t]*$") "Matches an entire property drawer.") (defconst org-clock-drawer-re