emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/org b1cb3b724a 3/4: Revert "org-element: Simplify drawe


From: ELPA Syncer
Subject: [elpa] externals/org b1cb3b724a 3/4: Revert "org-element: Simplify drawer and property drawer regexps"
Date: Sun, 10 Dec 2023 10:05:13 -0500 (EST)

branch: externals/org
commit b1cb3b724a17320f631f4e7ed86d0fee7fbbf686
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    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 2030f566e9..06b2f9099e 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]