emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Bastien Guerry <bzg@altern.org>
To: emacs-orgmode@gnu.org
Subject: [Accepted]  org-publish: Fix regexp for include files
Date: Sat, 16 Jul 2011 15:01:18 +0200 (CEST)	[thread overview]
Message-ID: <20110716130118.B366D6022@myhost.localdomain> (raw)
In-Reply-To: 1310818927-25567-1-git-send-email-jonas@ifi.uio.no

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)))))
> 

     prev parent reply	other threads:[~2011-07-16 13:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-16 12:22 [PATCH] org-publish: Fix regexp for include files Jon Anders Skorpen
2011-07-16 13:01 ` Bastien Guerry [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110716130118.B366D6022@myhost.localdomain \
    --to=bzg@altern.org \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).