From mboxrd@z Thu Jan  1 00:00:00 1970
From: Richard Hansen <rhansen@bbn.com>
Subject: Re: [PATCH] fix SETUPFILE pathname expansion with subdirectories
Date: Sat, 19 Sep 2015 16:18:28 -0400
Message-ID: <55FDC314.2040205@bbn.com>
References: <1442622121-25638-1-git-send-email-rhansen@bbn.com>
	<87lhc2u8ln.fsf@nicolasgoaziou.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43685)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rhansen@bbn.com>) id 1ZdOam-0005HH-0a
	for emacs-orgmode@gnu.org; Sat, 19 Sep 2015 16:18:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rhansen@bbn.com>) id 1ZdOai-0002oN-Fr
	for emacs-orgmode@gnu.org; Sat, 19 Sep 2015 16:18:40 -0400
Received: from smtp.bbn.com ([128.33.0.80]:28583)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rhansen@bbn.com>) id 1ZdOai-0002o5-DV
	for emacs-orgmode@gnu.org; Sat, 19 Sep 2015 16:18:36 -0400
In-Reply-To: <87lhc2u8ln.fsf@nicolasgoaziou.fr>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: emacs-orgmode@gnu.org

On 2015-09-19 04:16, Nicolas Goaziou wrote:
> Hello,
>=20
> Richard Hansen <rhansen@bbn.com> writes:
>=20
>> * 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
>=20
> Thank you.
>=20
> Could you also provide add a test for it in "test-org.el"
> (test-org/set-regexps-and-options)?

I'm having trouble running the test suite.  'make test' freezes at:

  test-ob-shell/dont-insert-spaces-on-expanded-bodies

If I comment out that test, it hangs at:

  test-ob-shell/dont-error-on-empty-results

If I comment out that test, it gets stuck at:

  test-ob-python/colnames-yes-header-argument-again

I haven't yet tried commenting out that test because I feel like I'm
doing something wrong.  Any hints?  (Emacs 24.4.1 from Ubuntu 15.04)

Thanks,
Richard