summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-12-29 21:16:36 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-12-29 21:16:36 +0100
commit2c6a4bec7371c122f31eb077319f032fa8fcf75c (patch)
treef5c196bd02f7a17575e987ec99ac7db240f6636c
parent35e8e5c93a8b93df2bf125d72778a8ab4aabdb0c (diff)
parentacebe9a2829dcb53958e6fb5cfe3dddd9ca63b44 (diff)
downloadorg-mode-2c6a4bec7371c122f31eb077319f032fa8fcf75c.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-publish.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index 43a0593..8cea7e8 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -101,7 +101,8 @@ Most properties are optional, but some should always be set:
Extension (without the dot!) of source files. This can be
a regular expression. If not given, \"org\" will be used as
- default extension.
+ default extension. If it is `any', include all the files,
+ even without extension.
`:publishing-directory'
@@ -473,7 +474,10 @@ This splices all the components into the list."
(x (or (plist-get (cdr prj) :base-extension) "org"))
(e (plist-get (cdr prj) :exclude))
(i (plist-get (cdr prj) :include))
- (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\)$")))
+ (xm (concat "\\`" b
+ (if r ".+" "[^/]+")
+ (and (not (eq x 'any))
+ (format "\\.\\(%s\\)\\'" x)))))
(when
(or (and i
(member filename