summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-09-24 10:58:43 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-09-24 10:58:43 +0200
commit3056abe7816af7f1fb541fe3793bb1b30d6b69ad (patch)
tree5ffe44129744f276095143912bfb19932899f169
parent039004ddee7cd7163dccf4b7af6e562ae6e32311 (diff)
parentd40deb6967dd7d2369576319cd1c517e1c454b95 (diff)
downloadorg-mode-3056abe7816af7f1fb541fe3793bb1b30d6b69ad.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-publish.el4
-rw-r--r--testing/lisp/test-ox-publish.el8
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index 753176b..b146e51 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -435,8 +435,8 @@ This splices all the components into the list."
(let* ((base-dir (file-name-as-directory
(org-publish-property :base-directory project)))
(extension (or (org-publish-property :base-extension project) "org"))
- (match (and (not (eq extension 'any))
- (concat "^[^\\.].*\\.\\(" extension "\\)$")))
+ (match (if (eq extension 'any) ""
+ (format "^[^\\.].*\\.\\(%s\\)$" extension)))
(base-files
(cl-remove-if #'file-directory-p
(if (org-publish-property :recursive project)
diff --git a/testing/lisp/test-ox-publish.el b/testing/lisp/test-ox-publish.el
index 3553807..a511905 100644
--- a/testing/lisp/test-ox-publish.el
+++ b/testing/lisp/test-ox-publish.el
@@ -455,6 +455,14 @@ Unless set otherwise in PROPERTIES, `:base-directory' is set to
(org-publish-project-alist
`(("p" :base-directory ,base :base-extension any))))
(org-publish-get-project-from-filename file)))
+ ;; Pathological case: Handle both :extension any and :recursive t.
+ (should
+ (let* ((base (expand-file-name "examples/pub/" org-test-dir))
+ (file (expand-file-name "sub/c.org" base))
+ (org-publish-project-alist
+ `(("p" :base-directory ,base :recursive t :base-extension any))))
+ (org-publish-get-base-files (org-publish-get-project-from-filename file))))
+
;; Check :exclude property.
(should-not
(let* ((base (expand-file-name "examples/pub/" org-test-dir))