From: Anoop GR <anoopemacs@gmail.com>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: emacs-orgmode@gnu.org, Bastien Guerry <bzg@gnu.org>
Subject: Re: ob-clojure breaks tangling of comments using org-babel-tangle for clojure source code blocks
Date: Fri, 18 Oct 2024 15:48:56 +0530 [thread overview]
Message-ID: <CACabEsTHZnowOwqY=bYnhCszSO5T6aex7HD_T4DVgVEohmMuTg@mail.gmail.com> (raw)
In-Reply-To: <874j5azk2p.fsf@localhost>
[-- Attachment #1.1: Type: text/plain, Size: 815 bytes --]
I have attached the patch file, created against the latest main branch.
On Thu, Oct 17, 2024 at 11:28 PM Ihor Radchenko <yantar92@posteo.net> wrote:
> Anoop GR <anoopemacs@gmail.com> writes:
>
> >>
> >> I guess that we may leave the comments intact if the code block does not
> >> have :var.
> >>
> >
> > I moved the comment stripping code in org-babel-expand-body:clojure to
> > follow the above idea:-
> > ...
>
> The code look reasonable.
> Would you be interested to convert it into a patch?
> See https://orgmode.org/worg/org-contribute.html
>
> --
> Ihor Radchenko // yantar92,
> Org mode contributor,
> Learn more about Org mode at <https://orgmode.org/>.
> Support Org development at <https://liberapay.com/org-mode>,
> or support my work at <https://liberapay.com/yantar92>
>
[-- Attachment #1.2: Type: text/html, Size: 1567 bytes --]
[-- Attachment #2: 0001-ob-clojure.el-Fix-comments-getting-deleted-on-tangli.patch --]
[-- Type: text/x-patch, Size: 1769 bytes --]
From c5d656c10c78a1738d3daf50a0dc0a46ebf3fd3e Mon Sep 17 00:00:00 2001
From: Anoop G R <anoopemacs@gmail.com>
Date: Fri, 18 Oct 2024 15:30:54 +0530
Subject: [PATCH] ob-clojure.el: Fix comments getting deleted on tangling of
clojure source blocks
* lisp/ob-clojure.el (org-babel-expand-body:clojure): Leave the
comments intact if the code block does not have :var.
Reported-by: "Anoop G R" <anoopemacs@gmail.com>
Link: https://list.orgmode.org/874j5azk2p.fsf@localhost/T/#t
TINYCHANGE
---
lisp/ob-clojure.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 98a66d1..fdb0a75 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -155,21 +155,21 @@ or set the `:backend' header argument"))))
(result-params (cdr (assq :result-params params)))
(print-level nil)
(print-length nil)
- ;; Remove comments, they break (let [...] ...) bindings
- (body (replace-regexp-in-string "^[ ]*;+.*$" "" body))
(body (org-trim
(concat
;; Source block specified namespace :ns.
(and (cdr (assq :ns params)) (format "(ns %s)\n" ns))
;; Variables binding.
(if (null vars) (org-trim body)
- (format "(let [%s]\n%s)"
+ ;; Remove comments, they break (let [...] ...) bindings
+ (let ((body (replace-regexp-in-string "^[ ]*;+.*$" "" body)))
+ (format "(let [%s]\n%s)"
(mapconcat
(lambda (var)
(format "%S '%S" (car var) (cdr var)))
vars
"\n ")
- body))))))
+ body)))))))
;; If the result param is set to "output" we don't have to do
;; anything special and just let the backend handle everything
(if (member "output" result-params)
--
2.34.1
next prev parent reply other threads:[~2024-10-18 11:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-15 17:43 ob-clojure breaks tangling of comments using org-babel-tangle for clojure source code blocks Anoop GR
2024-10-15 17:51 ` Anoop GR
2024-10-15 17:52 ` Anoop GR
2024-10-15 17:53 ` Anoop GR
2024-10-16 19:49 ` Ihor Radchenko
2024-10-17 13:42 ` Anoop GR
2024-10-17 17:59 ` Ihor Radchenko
2024-10-18 10:18 ` Anoop GR [this message]
2024-10-18 17:23 ` Ihor Radchenko
2024-10-18 20:16 ` Anoop GR
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='CACabEsTHZnowOwqY=bYnhCszSO5T6aex7HD_T4DVgVEohmMuTg@mail.gmail.com' \
--to=anoopemacs@gmail.com \
--cc=bzg@gnu.org \
--cc=emacs-orgmode@gnu.org \
--cc=yantar92@posteo.net \
/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).