From: Richard Hansen <rhansen@bbn.com>
To: emacs-orgmode@gnu.org
Cc: Richard Hansen <rhansen@bbn.com>
Subject: [PATCH] fix SETUPFILE pathname expansion with subdirectories
Date: Fri, 18 Sep 2015 20:22:01 -0400 [thread overview]
Message-ID: <1442622121-25638-1-git-send-email-rhansen@bbn.com> (raw)
* 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
---
lisp/org.el | 1 +
lisp/ox.el | 1 +
2 files changed, 2 insertions(+)
diff --git a/lisp/org.el b/lisp/org.el
index 74fe4ae..ded3e13 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5194,6 +5194,7 @@ Return value contains the following keys: `archive', `category',
(org-remove-double-quotes value)))))
(when (and f (file-readable-p f) (not (member f files)))
(with-temp-buffer
+ (cd (file-name-directory f))
(insert-file-contents f)
(setq alist
;; Fake Org mode to benefit from cache
diff --git a/lisp/ox.el b/lisp/ox.el
index bfdfeba..07e5ef3 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -1455,6 +1455,7 @@ Assume buffer is in Org mode. Narrowing, if any, is ignored."
;; Avoid circular dependencies.
(unless (member file files)
(with-temp-buffer
+ (cd (file-name-directory file))
(insert (org-file-contents file 'noerror))
(let ((org-inhibit-startup t)) (org-mode))
(setq plist (funcall get-options
--
2.5.3
next reply other threads:[~2015-09-19 0:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-19 0:22 Richard Hansen [this message]
2015-09-19 8:16 ` [PATCH] fix SETUPFILE pathname expansion with subdirectories Nicolas Goaziou
2015-09-19 20:18 ` Richard Hansen
2015-09-19 22:07 ` [PATCH v2] " Richard Hansen
2015-09-19 22:43 ` Kyle Meyer
2015-09-19 23:14 ` Richard Hansen
2015-09-20 5:07 ` Kyle Meyer
2015-09-20 5:28 ` [PATCH v3] " Richard Hansen
2015-09-22 22:28 ` Richard Hansen
2015-09-24 8:22 ` Nicolas Goaziou
2015-09-24 21:55 ` Richard Hansen
2015-09-24 22:20 ` [PATCH 1/2] test INCLUDE " Richard Hansen
2015-09-24 22:20 ` [PATCH 2/2] fix SETUPFILE pathname expansion from within an INCLUDE Richard Hansen
2015-09-25 11:58 ` Nicolas Goaziou
2015-09-25 11:51 ` [PATCH v3] fix SETUPFILE pathname expansion with subdirectories Nicolas Goaziou
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=1442622121-25638-1-git-send-email-rhansen@bbn.com \
--to=rhansen@bbn.com \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).