From mboxrd@z Thu Jan 1 00:00:00 1970 From: stardiviner Subject: Re: ob-clojure should not tangle with inserting (ns ..) line when no :ns specified. Date: Thu, 10 Jan 2019 09:47:53 +0800 Message-ID: <87r2dlz3jq.fsf@gmail.com> References: <877egvj6l2.fsf@gmail.com> Reply-To: numbchild@gmail.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([209.51.188.92]:56157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghPPp-0002Gk-B8 for emacs-orgmode@gnu.org; Wed, 09 Jan 2019 20:45:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghPPn-0000JM-CR for emacs-orgmode@gnu.org; Wed, 09 Jan 2019 20:45:49 -0500 Received: from [61.175.244.13] (port=34602 helo=dark.localdomain) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghPPm-0000Hy-Mb for emacs-orgmode@gnu.org; Wed, 09 Jan 2019 20:45:47 -0500 In-reply-to: <877egvj6l2.fsf@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: org-mode --=-=-= Content-Type: text/plain stardiviner writes: > The ob-clojure tangle will insert ~(ns ..)~ from babel header argument :ns or use defualt ~(ns user)~. > > #+begin_src clojure :eval no :ns "" :tangle "data/code/xunfei-clj-demo/project.clj" :results link :file "data/code/xunfei-clj-demo/project.clj" > (defproject xunfei-clj-demo "0.1.0-SNAPSHOT" > :description "xunfei-clj demo" > :url "http://example.com/FIXME" > :license {:name "Eclipse Public License" > :url "http://www.eclipse.org/legal/epl-v10.html"} > :dependencies [[org.clojure/clojure "1.9.0"] > [xunfei-clj "0.1.4-SNAPSHOT"]] > :resource-paths ["lib/Msc.jar"]) > #+end_src > > In upper case, obviously I don't want insert the ~(ns ..)~ line of code. > > I hope the ob-clojure header argument ~:ns~ should detect value like > "nil", "" (empty string) or something else. Or when ~:ns~ header > argument is not specified. So that the tangling will not auto insert > ~(ns ..)~ line. I added an patch to detect :ns is not specified which is `nil'. This will be better for tangling. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-lisp-ob-clojure.el-Don-t-tangle-with-auto-prepend-ns.patch >From 749e85a30ca6226c4b3aaef85ae0d72b51d6018e 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. --- etc/ORG-NEWS | 5 +++++ lisp/ob-clojure.el | 34 +++++++++++++++++++--------------- 2 files changed, 24 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) -- 2.20.1 --=-=-= Content-Type: text/plain -- [ 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 --=-=-=--