From 7ba099a3fda43b0d73107c454474a8d9300489c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Wed, 30 Nov 2022 13:23:38 +0100 Subject: [PATCH] Backport commit c3466099c from Emacs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org-element.el (org-element--get-node-properties): Escape literal `+`. * lisp/org-persist.el (org-persist-load:index): Replace line-start with string-start when the latter is meant. Org regexp style fixes c3466099c5f44c52ec73a1bbbb2b42de6f29ac7f Mattias Engdegård Wed Nov 30 13:23:38 2022 +0100 --- lisp/org-element.el | 2 +- lisp/org-persist.el | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index bc2fa0b98..a290b4121 100644 --- a/lisp/org-element.el +++ b/lisp/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-persist.el b/lisp/org-persist.el index 3435bef26..d60fdc657 100644 --- a/lisp/org-persist.el +++ b/lisp/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))))