master f3ef75107b 6/6: Merge from origin/emacs-29

[Stefan Kangas]

branch: master
commit f3ef75107ba91f1bc5e6f1e11bee5fabab2458e1
Merge: 16d74c215d c3466099c5
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-29
    
    c3466099c5 Org regexp style fixes
---
 lisp/org/org-element.el | 2 +-
 lisp/org/org-persist.el | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index bc2fa0b985..a290b4121f 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -1040,7 +1040,7 @@ parse properties for property drawer at point."
                  (property-value (match-string-no-properties 3)))
             (cond
              ((and (plist-member properties property-name-symbol)
-                   (string-match-p "+$" property-name))
+                   (string-match-p "\\+$" property-name))
               (let ((val (plist-get properties property-name-symbol)))
                 (if (listp val)
                     (setq properties
diff --git a/lisp/org/org-persist.el b/lisp/org/org-persist.el
index 3435bef264..d60fdc657a 100644
--- a/lisp/org/org-persist.el
+++ b/lisp/org/org-persist.el
@@ -593,7 +593,8 @@ COLLECTION is the plist holding data collection."
         (mapc (lambda (collection) (org-persist--add-to-index collection 
'hash)) org-persist--index)
       (setq org-persist--index nil)
       (when (file-exists-p org-persist-directory)
-        (dolist (file (directory-files org-persist-directory 'absolute 
"^[^.][^.]"))
+        (dolist (file (directory-files org-persist-directory 'absolute
+                                       "\\`[^.][^.]"))
           (if (file-directory-p file)
               (delete-directory file t)
             (delete-file file))))