[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] [patch, ox] #+INCLUDE resolves links
From: |
Rasmus |
Subject: |
Re: [O] [patch, ox] #+INCLUDE resolves links |
Date: |
Thu, 02 Oct 2014 19:47:45 +0200 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3.94 (gnu/linux) |
Nicolas Goaziou <address@hidden> writes:
> Hello,
>
> Rasmus <address@hidden> 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!!!
>From 04d90414a848a55ff602cfbc0b5f300299830732 Mon Sep 17 00:00:00 2001
From: rasmus <address@hidden>
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
- Re: [O] [patch, ox] #+INCLUDE resolves links, Nicolas Goaziou, 2014/10/01
- Re: [O] [patch, ox] #+INCLUDE resolves links, Rasmus, 2014/10/01
- Re: [O] [patch, ox] #+INCLUDE resolves links, Xavier Garrido, 2014/10/02
- Re: [O] [patch, ox] #+INCLUDE resolves links, Rasmus, 2014/10/02
- Re: [O] [patch, ox] #+INCLUDE resolves links, Aaron Ecay, 2014/10/02
- Re: [O] [patch, ox] #+INCLUDE resolves links, Nicolas Goaziou, 2014/10/02
- Re: [O] [patch, ox] #+INCLUDE resolves links,
Rasmus <=
- Re: [O] [patch, ox] #+INCLUDE resolves links, Achim Gratz, 2014/10/02
- Re: [O] [patch, ox] #+INCLUDE resolves links, Rasmus, 2014/10/02