[elpa] externals/org 2b96501070 066/101: org-element: Simplify drawer and property drawer regexps

[ELPA Syncer]

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

    org-element: Simplify drawer and property drawer regexps
    
    * lisp/org-element.el (org-element-drawer-re-nogroup): New constant
    regexp matching drawer line without creating regexp groups.
    (org-element--current-element): Use the new constant.
    * lisp/org.el (org-drawer-regexp): Ensure that it is the same with
    org-element version and mark for removal/alias.
    (org-property-drawer-re): Simplify, removing unnecessary matching of
    node property structures.
    
    Link: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63225#62
---
 lisp/org-element.el |  7 +++++++
 lisp/org.el         | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index e6a34c1a94..d368653a5a 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -169,6 +169,13 @@ Style, if any, is located in match group 1.")
   "Regexp matching opening or closing line of a drawer.
 Drawer's name is located in match group 1.")
 
+(defconst org-element-drawer-re-nogroup
+  (rx line-start (0+ (any ?\s ?\t))
+      ":" (1+ (any ?- ?_ word)) ":"
+      (0+ (any ?\s ?\t)) line-end)
+  "Regexp matching opening or closing line of a drawer.
+Drawer's name is located in match group 1.")
+
 (defconst org-element-dynamic-block-open-re
   (rx line-start (0+ (any ?\s ?\t))
       "#+BEGIN:" (0+ (any ?\s ?\t))
diff --git a/lisp/org.el b/lisp/org.el
index c8131ad41f..8346014623 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -594,7 +594,11 @@ Matched keyword is in group 1.")
 
 ;;;; Drawer
 
-(defconst org-drawer-regexp "^[ \t]*:\\(\\(?:\\w\\|[-_]\\)+\\):[ \t]*$"
+(defconst org-drawer-regexp
+  ;; FIXME: Duplicate of `org-element-drawer-re'.
+  (rx line-start (0+ (any ?\s ?\t))
+      ":" (group (1+ (any ?- ?_ word))) ":"
+      (0+ (any ?\s ?\t)) line-end)
   "Matches first or last line of a hidden block.
 Group 1 contains drawer's name or \"END\".")
 
@@ -617,9 +621,14 @@ Group 1 contains drawer's name or \"END\".")
   "Matches an entire LOGBOOK drawer.")
 
 (defconst org-property-drawer-re
-  (concat "^[ \t]*:PROPERTIES:[ \t]*\n"
-         "\\(?:[ \t]*:\\S-+:\\(?:[ \t].*\\)?[ \t]*\n\\)*?"
-         "[ \t]*:END:[ \t]*$")
+  ;; 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)
   "Matches an entire property drawer.")
 
 (defconst org-clock-drawer-re