From: Rasmus <rasmus@gmx.us>
To: emacs-orgmode@gnu.org
Subject: Re: [patch, ox] #+INCLUDE resolves links
Date: Thu, 02 Oct 2014 19:47:45 +0200 [thread overview]
Message-ID: <87h9zmz7lq.fsf@gmx.us> (raw)
In-Reply-To: 87tx3m76rz.fsf@nicolasgoaziou.fr
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Hello,
>
> Rasmus <rasmus@gmx.us> writes:
>
>> Shoot. Fixed in attached (tested with texi2pdf).
>
> Applied. Thank you for this patch.
Please also apply this patch to make "make test" pass.
—Rasmus
--
Don't panic!!!
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-test-ox.el-Fix-test-error-from-986037a.patch --]
[-- Type: text/x-diff, Size: 2287 bytes --]
From 04d90414a848a55ff602cfbc0b5f300299830732 Mon Sep 17 00:00:00 2001
From: rasmus <rasmus@pank.eu>
Date: Thu, 2 Oct 2014 19:41:31 +0200
Subject: [PATCH] test-ox.el: Fix test-error from 986037a.
* test-ox.el (test-org-export/expand-include): Updated tests.
---
testing/lisp/test-ox.el | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/testing/lisp/test-ox.el b/testing/lisp/test-ox.el
index 915a5a6..2642f4a 100644
--- a/testing/lisp/test-ox.el
+++ b/testing/lisp/test-ox.el
@@ -804,18 +804,18 @@ text
(org-test-with-temp-text "#+INCLUDE: dummy.org"
(org-export-expand-include-keyword)))
;; Full insertion with recursive inclusion.
- (org-test-with-temp-text
- (format "#+INCLUDE: \"%s/examples/include.org\"" org-test-dir)
- (org-export-expand-include-keyword)
- (should (equal (buffer-string)
- "Small Org file with an include keyword.
-
-#+BEGIN_SRC emacs-lisp :exports results\n(+ 2 1)\n#+END_SRC
-
-Success!
-
-* Heading
-body\n")))
+ (should
+ (equal
+ (with-temp-buffer
+ (insert-file
+ (expand-file-name "examples/include.org" org-test-dir))
+ (replace-regexp-in-string
+ (regexp-quote "#+INCLUDE: \"include2.org\"")
+ "Success!" (buffer-string)))
+ (org-test-with-temp-text
+ (format "#+INCLUDE: \"%s/examples/include.org\"" org-test-dir)
+ (org-export-expand-include-keyword)
+ (buffer-string))))
;; Localized insertion.
(org-test-with-temp-text
(format "#+INCLUDE: \"%s/examples/include.org\" :lines \"1-2\""
@@ -829,7 +829,7 @@ body\n")))
"* Top heading\n** Heading\nbody\n"
(org-test-with-temp-text
(format
- "* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-\""
+ "* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-11\""
org-test-dir)
(org-export-expand-include-keyword)
(buffer-string))))
@@ -838,7 +838,7 @@ body\n")))
"* Top heading\n* Heading\nbody\n"
(org-test-with-temp-text
(format
- "* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-\" :minlevel 1"
+ "* Top heading\n#+INCLUDE: \"%s/examples/include.org\" :lines \"9-11\" :minlevel 1"
org-test-dir)
(org-export-expand-include-keyword)
(buffer-string))))
--
2.1.2
next prev parent reply other threads:[~2014-10-02 17:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-21 0:51 [patch, ox] #+INCLUDE resolves links Rasmus
2014-09-21 11:46 ` Rasmus
2014-09-21 13:53 ` Nicolas Goaziou
2014-09-21 14:46 ` Rasmus
2014-09-21 19:51 ` Nicolas Goaziou
2014-09-23 23:25 ` Rasmus
2014-09-24 21:22 ` Nicolas Goaziou
2014-09-28 19:32 ` Rasmus
2014-09-30 8:07 ` Nicolas Goaziou
2014-09-30 10:18 ` Rasmus
2014-09-30 14:29 ` Nicolas Goaziou
2014-09-30 21:48 ` Rasmus
2014-10-01 20:03 ` Nicolas Goaziou
2014-10-01 21:27 ` Rasmus
2014-10-02 7:29 ` Xavier Garrido
2014-10-02 8:55 ` Rasmus
2014-10-02 16:30 ` Aaron Ecay
2014-10-02 16:53 ` Nicolas Goaziou
2014-10-02 17:47 ` Rasmus [this message]
2014-10-02 19:11 ` Achim Gratz
2014-10-02 20:58 ` Rasmus
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=87h9zmz7lq.fsf@gmx.us \
--to=rasmus@gmx.us \
--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).