From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Guerry Subject: [Accepted] org-publish: Fix regexp for include files Date: Sat, 16 Jul 2011 15:01:18 +0200 (CEST) Message-ID: <20110716130118.B366D6022@myhost.localdomain> References: <1310818927-25567-1-git-send-email-jonas@ifi.uio.no> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:51232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qi4UN-0005f6-8v for emacs-orgmode@gnu.org; Sat, 16 Jul 2011 09:01:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qi4UJ-0004w6-54 for emacs-orgmode@gnu.org; Sat, 16 Jul 2011 09:00:59 -0400 Received: from mail-fx0-f52.google.com ([209.85.161.52]:57994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qi4UI-0004vv-M7 for emacs-orgmode@gnu.org; Sat, 16 Jul 2011 09:00:54 -0400 Received: by fxd18 with SMTP id 18so3461920fxd.39 for ; Sat, 16 Jul 2011 06:00:53 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org 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 > 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 > > * 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))))) >