[PATCH] default base-extension .org for org-publish

[PATCH] default base-extension .org for org-publish

[Daniel Clemente]

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
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 "\\)$")))

#+END_QUOTE

Patchwork: Patch 112 Accepted

[Carsten Dominik]

Patch 112 (http://patchwork.newartisans.com/patch/112/) is now Accepted.

This relates to the following submission:

http://mid.gmane.org/%3C87sk3y2vlo.wl%25n142857%40gmail.com%3E

Re: [PATCH] default base-extension .org for org-publish

[Carsten Dominik]

Applied, thanks.

- Carsten

On Jul 5, 2010, at 10:14 AM, Daniel Clemente wrote:

>
> 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
> 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 "\\)$")))
>
> #+END_QUOTE
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

- Carsten