summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Clemente <n142857@gmail.com>2010-07-05 13:14:59 +0000
committerCarsten Dominik <carsten.dominik@gmail.com>2010-07-06 12:56:47 +0200
commitb324bdca5ca9543ac387371cf9347ce7f24bbbb6 (patch)
tree17327992d5a191c0d5242ab628a6e404677b7c00
parentb6305c713c54421257759c38c260f516686f2811 (diff)
downloadorg-mode-b324bdca5ca9543ac387371cf9347ce7f24bbbb6.tar.gz
default base-extension .org for org-publish
Org-publish: correctly find files in projects which didn't define a base-extension. Previously, (org-publish-get-project-from-filename "~/org/file.org") would return nil because the constructed regular expression "^/home/dc/org/.+\\.\\(\\)$" required a dot at the end. #+BEGIN_QUOTE #+END_QUOTE
-rw-r--r--lisp/org-publish.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index b387e7b..a50cf56 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -466,7 +466,7 @@ matching filenames."
;; [[info:org:Selecting%20files]] shows how this is supposed to work:
(let* ((r (plist-get (cdr prj) :recursive))
(b (expand-file-name (plist-get (cdr prj) :base-directory)))
- (x (plist-get (cdr prj) :base-extension))
+ (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 "\\)$")))