procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-29

Browse source 
c3466099c5 Org regexp style fixes
This commit is contained in:
Stefan Kangas 2022-11-30 16:10:39 +01:00
commit f3ef75107b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/org/org-element.el
View file

@ -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

3
lisp/org/org-persist.el
View file

@ -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))))