* [PATCH] org-publish: Fix regexp for include files
@ 2011-07-16 12:22 Jon Anders Skorpen
2011-07-16 13:01 ` [Accepted] " Bastien Guerry
0 siblings, 1 reply; 2+ messages in thread
From: Jon Anders Skorpen @ 2011-07-16 12:22 UTC (permalink / raw)
To: emacs-orgmode; +Cc: Jon Anders Skorpen
* org-publish.el (org-publish-cache-file-needs-publishing): Regexp did
not find includes with double quoted file names.
TINYCHANGE
---
lisp/org-publish.el | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lisp/org-publish.el b/lisp/org-publish.el
index b8e932d..9654a6d 100644
--- a/lisp/org-publish.el
+++ b/lisp/org-publish.el
@@ -1108,7 +1108,7 @@ so that the file including them will be republished as well."
(when (equal (file-name-extension filename) "org")
(find-file (expand-file-name filename))
(goto-char (point-min))
- (while (re-search-forward "^#\\+INCLUDE: \\(.+\\)[ ^\t]*$" nil t)
+ (while (re-search-forward "^#\\+INCLUDE:[ \t]+\"?\\([^ \t\"]*\\)\"?[ \t]*.*$" nil t)
(let* ((included-file (expand-file-name (match-string 1))))
(add-to-list 'included-files-ctime
(org-publish-cache-ctime-of-src included-file) t)))))
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Accepted] org-publish: Fix regexp for include files
2011-07-16 12:22 [PATCH] org-publish: Fix regexp for include files Jon Anders Skorpen
@ 2011-07-16 13:01 ` Bastien Guerry
0 siblings, 0 replies; 2+ messages in thread
From: Bastien Guerry @ 2011-07-16 13:01 UTC (permalink / raw)
To: emacs-orgmode
Patch 833 (http://patchwork.newartisans.com/patch/833/) is now "Accepted".
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C1310818927-25567-1-git-send-email-jonas%40ifi.uio.no%3E
Here is the original message containing the patch:
> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [O] org-publish: Fix regexp for include files
> Date: Sat, 16 Jul 2011 17:22:07 -0000
> From: Jon Anders Skorpen <jonas@ifi.uio.no>
> X-Patchwork-Id: 833
> Message-Id: <1310818927-25567-1-git-send-email-jonas@ifi.uio.no>
> To: emacs-orgmode@gnu.org
> Cc: Jon Anders Skorpen <jonas@ifi.uio.no>
>
> * org-publish.el (org-publish-cache-file-needs-publishing): Regexp did
> not find includes with double quoted file names.
>
> TINYCHANGE
>
> ---
> lisp/org-publish.el | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/lisp/org-publish.el b/lisp/org-publish.el
> index b8e932d..9654a6d 100644
> --- a/lisp/org-publish.el
> +++ b/lisp/org-publish.el
> @@ -1108,7 +1108,7 @@ so that the file including them will be republished as well."
> (when (equal (file-name-extension filename) "org")
> (find-file (expand-file-name filename))
> (goto-char (point-min))
> - (while (re-search-forward "^#\\+INCLUDE: \\(.+\\)[ ^\t]*$" nil t)
> + (while (re-search-forward "^#\\+INCLUDE:[ \t]+\"?\\([^ \t\"]*\\)\"?[ \t]*.*$" nil t)
> (let* ((included-file (expand-file-name (match-string 1))))
> (add-to-list 'included-files-ctime
> (org-publish-cache-ctime-of-src included-file) t)))))
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-16 13:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-16 12:22 [PATCH] org-publish: Fix regexp for include files Jon Anders Skorpen
2011-07-16 13:01 ` [Accepted] " Bastien Guerry
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).