From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: [PATCH] fix SETUPFILE pathname expansion with subdirectories Date: Sat, 19 Sep 2015 10:16:52 +0200 Message-ID: <87lhc2u8ln.fsf@nicolasgoaziou.fr> References: <1442622121-25638-1-git-send-email-rhansen@bbn.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdDIg-0006Sp-Sk for emacs-orgmode@gnu.org; Sat, 19 Sep 2015 04:15:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdDIf-0003JW-Ox for emacs-orgmode@gnu.org; Sat, 19 Sep 2015 04:15:14 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:c:538::196]:42155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdDIf-0003Gz-II for emacs-orgmode@gnu.org; Sat, 19 Sep 2015 04:15:13 -0400 In-Reply-To: <1442622121-25638-1-git-send-email-rhansen@bbn.com> (Richard Hansen's message of "Fri, 18 Sep 2015 20:22:01 -0400") 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: Richard Hansen Cc: emacs-orgmode@gnu.org Hello, Richard Hansen writes: > * lisp/org.el (org--setup-collect-keywords): cd to the directory > containing the SETUPFILE before recursing so that relative pathnames > in the SETUPFILE are expanded properly. > > * lisp/ox.el (org-export--get-inbuffer-options): cd to the directory > containing the SETUPFILE before recursing so that relative pathnames > in the SETUPFILE are expanded properly. > > If /path/to/foo.org contains: > > #+SETUPFILE: settings/beamer.org > > and /path/to/settings/beamer.org contains: > > #+SETUPFILE: common.org > > then we want to read /path/to/settings/common.org, not > /path/to/common.org. > > TINYCHANGE Thank you. Could you also provide add a test for it in "test-org.el" (test-org/set-regexps-and-options)? Regards, -- Nicolas Goaziou