From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [PATCH] default base-extension .org for org-publish Date: Tue, 6 Jul 2010 12:58:19 +0200 Message-ID: References: <87sk3y2vlo.wl%n142857@gmail.com> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=55290 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OW5r7-0003FL-7V for emacs-orgmode@gnu.org; Tue, 06 Jul 2010 06:58:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OW5r5-0007MY-Pa for emacs-orgmode@gnu.org; Tue, 06 Jul 2010 06:58:25 -0400 Received: from mail-bw0-f41.google.com ([209.85.214.41]:50891) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OW5r5-0007MQ-HP for emacs-orgmode@gnu.org; Tue, 06 Jul 2010 06:58:23 -0400 Received: by bwz9 with SMTP id 9so4292991bwz.0 for ; Tue, 06 Jul 2010 03:58:22 -0700 (PDT) In-Reply-To: <87sk3y2vlo.wl%n142857@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Daniel Clemente Cc: org-mode Mailinglist Applied, thanks. - Carsten On Jul 5, 2010, at 10:14 AM, Daniel Clemente wrote: > > Org-publish: correctly find files in projects which didn't define a > base-extension. > Previously, (org-publish-get-project-from-filename "~/org/file.org") > would return nil because the constructed regular expression "^/home/ > dc/org/.+\\.\\(\\)$" required a dot at the end. > > #+BEGIN_QUOTE > diff --git a/lisp/org-publish.el b/lisp/org-publish.el > index b387e7b..a50cf56 100644 > --- a/lisp/org-publish.el > +++ b/lisp/org-publish.el > @@ -466,7 +466,7 @@ matching filenames." > ;; [[info:org:Selecting%20files]] shows how this is supposed to > work: > (let* ((r (plist-get (cdr prj) :recursive)) > (b (expand-file-name (plist-get (cdr prj) :base-directory))) > - (x (plist-get (cdr prj) :base-extension)) > + (x (or (plist-get (cdr prj) :base-extension) "org")) > (e (plist-get (cdr prj) :exclude)) > (i (plist-get (cdr prj) :include)) > (xm (concat "^" b (if r ".+" "[^/]+") "\\.\\(" x "\\)$"))) > > #+END_QUOTE > > _______________________________________________ > 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