* [PATCH] Fix :include bug in org-publish
@ 2010-08-16 14:11 Julien Barnier
2010-08-16 15:27 ` Carsten Dominik
0 siblings, 1 reply; 2+ messages in thread
From: Julien Barnier @ 2010-08-16 14:11 UTC (permalink / raw)
To: emacs-orgmode
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Fix :include bug in org-publish
2010-08-16 14:11 [PATCH] Fix :include bug in org-publish Julien Barnier
@ 2010-08-16 15:27 ` Carsten Dominik
0 siblings, 0 replies; 2+ messages in thread
From: Carsten Dominik @ 2010-08-16 15:27 UTC (permalink / raw)
To: Julien Barnier; +Cc: emacs-orgmode
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-16 15:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-16 14:11 [PATCH] Fix :include bug in org-publish Julien Barnier
2010-08-16 15:27 ` Carsten Dominik
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).