After few days later, I re-run "make test", it's fine now.
6 unexpected results:
FAILED ob-D/inhomogeneous_table
FAILED ob-D/list-list-var
FAILED ob-D/list-var
FAILED ob-D/vector-var
FAILED test-org-clock/clocktable/lang
FAILED test-org-colview/columns-width
Because few days passed, make sure the patch is the latest version. I
attached my patch again.
>From 8a64ccf659afcbd510e69eaa4ac175946f1ae311 Mon Sep 17 00:00:00 2001
From: stardiviner
Date: Thu, 10 Jan 2019 09:34:39 +0800
Subject: [PATCH] lisp/ob-clojure.el: Don't tangle with auto prepend ns
statement
* lisp/ob-clojure.el: (org-babel-expand-body:clojure,
org-babel-header-args:clojure): whether auto prepend Clojure (ns ..)
statement depend on whether have :ns header argument specified.
* etc/ORG-NEWS: mentioned this changed in ORG-NEWS.
* testing/test-ob-clojure.el: add a test for tangled clojure code
without (ns ..).
---
etc/ORG-NEWS| 5 +
lisp/ob-clojure.el | 34 ++---
testing/lisp/test-ob-clojure.el | 14 ++
3 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 1bb485ad1..2eea00d97 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -13,6 +13,11 @@ Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
* Version 9.3
** Incompatible changes
+*** ob-clojure will not auto prepend ~(ns ..)~ statement now
+When tangling, user usually just want to tangle literally code instead
+of prepend inserting a ~(ns ..)~ statement before source block
+code. Now, when you have no ~:ns~ header argument specified, this
+behavior will not happend automatically.
*** Change in behavior on exit from an Org edit buffer
Org will no longer attempt to restore the window configuration in the
frame to which the user returns after editing a source block with
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 2088ab375..55a4c3eb4 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -63,7 +63,11 @@
(add-to-list 'org-babel-tangle-lang-exts '("clojure" . "clj"))
(defvar org-babel-default-header-args:clojure '())
-(defvar org-babel-header-args:clojure '((package . :any)))
+(defvar org-babel-header-args:clojure '((package . :any))
+ "For the :ns header argument, when you don't specify it, it
+ will not auto prepend (ns ..) statement before source block
+ code. If you have a :ns specified, the (ns ..) statement will
+ be auto prepended before source block code.")
(defcustom org-babel-clojure-sync-nrepl-timeout 10
"Timeout value, in seconds, of a Clojure sync call.
@@ -103,20 +107,20 @@ If the value is nil, timeout is disabled."
(result-params (cdr (assq :result-params params)))
(print-level nil)
(print-length nil)
- (body
- (org-trim
- (format "(ns %s)\n%s"
- ;; Source block specified namespace :ns.
- ns
- ;; Variables binding.
- (if (null vars) (org-trim body)
- (format "(let [%s]\n%s)"
- (mapconcat
- (lambda (var)
-(format "%S (quote %S)" (car var) (cdr var)))
- vars
- "\n ")
- body))
+ (body (org-trim
+ (concat
+ ;; Source block specified namespace :ns.
+ (if (not (null (cdr (assq :ns params
+ (format "(ns %s)\n" ns))
+ ;; Variables binding.
+ (if (null vars) (org-trim body)
+ (format "(let [%s]\n%s)"
+ (mapconcat
+ (lambda (var)
+ (format "%S (quote %S)" (car var) (cdr var)))
+ vars
+ "\n ")
+ body))
(if (or (member "code" result-params)
(member "pp" result-params))
(format "(clojure.pprint/pprint (do %s))" body)
diff --git a/testing/lisp/test-ob-clojure.el b/testing/lisp/test-ob-clojure.el
index f917ca4cc..a5391dcb3 100644
--- a/testing/lisp/test-ob-clojure.el
+++ b/testing/lisp/test-ob-clojure.el
@@ -71,6 +71,20 @@
(should (string=
": 1"
(buffer-substring-no-properties (point-at-bol) (point-at-eol))
+(ert-deftest ob-clojure/tangle-without-ns ()
+ (org-test-with-temp-text
+ "#+begin_src clojure :tangle /tmp/test.clj
+(print 1)
+#+end_src"
+ (org-babel-next-src-block)
+ (org-babel-tangle)
+ (should
+(string=
+ "(print 1)
+"
+ (with-temp-buffer
+ (insert-file-contents "/tmp/test.clj")
+ (buffer-substring-no-properties (point-min) (point-max)))
(provide 'test-ob-clojure)
--
2.20.1
--
[ stardiviner ]
I try to make every word tell the meaning what I want to express.
Blog: https://stardiviner.github.io/
IRC(freenode): stardiviner, Matrix: stardiviner
GPG: F09F650D7D674819892591401B5DF1C95AE89AC3
