Re: [PATCH] Fix :include bug in org-publish

From: Carsten Dominik <carsten.dominik@gmail.com>
To: Julien Barnier <julien@nozav.org>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Fix :include bug in org-publish
Date: Mon, 16 Aug 2010 17:27:50 +0200	[thread overview]
Message-ID: <AE9060DA-B108-4770-B7ED-7B9AF19F4D6C@gmail.com> (raw)
In-Reply-To: <loom.20100816T160439-67@post.gmane.org>

Hi Julien,

I have applied a modified version of your patch, thanks.

- Carsten

On Aug 16, 2010, at 4:11 PM, Julien Barnier wrote:

> Hi all,
>
> Today I just noticed a small bug in org-publish. As the manual says,  
> the
> :include parameter in a project specification should be a list of  
> files, but it
> is treated as a regexp in (org-publish-get-project-from-filename),  
> thus making
> it impossible to use org-publish-current-file or org-publish-current- 
> project if
> an :include directive is present.
>
> The small attached patch should fix this.
>
> Sincerely,
>
> Julien
>
> * lisp/org-publish.el (org-publish-get-project-from-filename):
> Consider :include as a list, not a regexp.
> ---
> lisp/org-publish.el |    8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/lisp/org-publish.el b/lisp/org-publish.el
> index 6324eba..0656f8b 100644
> --- a/lisp/org-publish.el
> +++ b/lisp/org-publish.el
> @@ -471,7 +471,13 @@ matching filenames."
>                 (i (plist-get (cdr prj) :include))
>                 (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\) 
> $")))
>            (when (or
> -                  (and i (string-match i filename))
> +                  (and
> +                   i
> +                   (member filename
> +                           (mapcar
> +                            (lambda (arg)
> +                              (concat (file-name-as-directory b)  
> arg))
> +                            i)))
>                   (and
>                    (not (and e (string-match e filename)))
>                    (string-match xm filename)))
> -- 
> 1.7.1
>
>
>
> _______________________________________________
> 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