tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Nicolas Goaziou 2018-11-01 22:44:36 +01:00
parent e02d8cd811 85a675b939
commit ce37725926
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lisp/org-archive.el
View file

@ -160,20 +160,18 @@ archive file is."
(defun org-all-archive-files ()
"Get a list of all archive files used in the current buffer."
(let ((case-fold-search t)
files)
(org-with-wide-buffer
(goto-char (point-min))
(while (re-search-forward
"^[ \t]*\\(#\\+\\|:\\)ARCHIVE:[ \t]+\\(.*\\)"
nil t)
(when (save-match-data
(if (eq (match-string 1) ":") (org-at-property-p)
(eq (org-element-type (org-element-at-point)) 'keyword)))
(let ((file (org-extract-archive-file
(match-string-no-properties 2))))
(when (and (org-string-nw-p file) (file-exists-p file))
(push file files))))))
(let (files)
(org-with-point-at 1
(let ((regexp "^[ \t]*\\(#\\+\\|:\\)ARCHIVE:[ \t]+\\(.*\\)")
(case-fold-search t))
(while (re-search-forward regexp nil t)
(when (save-match-data
(if (equal ":" (match-string 1)) (org-at-property-p)
(eq 'keyword (org-element-type (org-element-at-point)))))
(let ((file (org-extract-archive-file
(match-string-no-properties 2))))
(when (and (org-string-nw-p file) (file-exists-p file))
(push file files)))))))
(setq files (nreverse files))
(let ((file (org-extract-archive-file)))
(when (and (org-string-nw-p file) (file-exists-p file))