mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 18:36:26 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2016-12-29 21:16:36 +01:00
parent 35e8e5c93a acebe9a282
commit 2c6a4bec73
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ox-publish.el
View file

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