From: Antero Mejr <antero@mailbox.org>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Move files when using org-babel-tangle-publish
Date: Fri, 08 Dec 2023 23:08:07 +0000 [thread overview]
Message-ID: <87v898mgx4.fsf@mailbox.org> (raw)
In-Reply-To: <871qbwcr7f.fsf@localhost> (Ihor Radchenko's message of "Fri, 08 Dec 2023 21:36:04 +0000")
[-- Attachment #1: Type: text/plain, Size: 997 bytes --]
Ihor Radchenko <yantar92@posteo.net> writes:
> Also, may I know if you have an FSF copyright assignment? If not, you
> also need to add TINYCHANGE to the commit message - see
> https://orgmode.org/worg/org-contribute.html#first-patch
Yes I have assigned copyright to the FSF already.
> May you please submit a patch against Org mode git repository -
> https://git.savannah.gnu.org/cgit/emacs/org-mode.git, as described at
> https://orgmode.org/worg/org-contribute.html ?
> Please quote `rename-file' and `copy-file' like I do - it is our commit
> message convention (https://orgmode.org/worg/org-contribute.html#orgd7441de)
>
>> - (mapc (lambda (el) (copy-file el pub-dir t)) (org-babel-tangle-file filename)))
>> + (mapc (lambda (el) (rename-file el pub-dir t))
>> + (org-babel-tangle-file filename)))
>
> I think that it would be nice to add a brief comment why `rename-file'
> to the code as well. `copy-file' looks innocent there from a first
> glance.
Fixed in attached patch.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Move-files-when-using-org-babel-tangle-publish.patch --]
[-- Type: text/x-patch, Size: 1179 bytes --]
From 9cc194dcb9bf6825d68aac3118f18ae96b8642a5 Mon Sep 17 00:00:00 2001
From: Antero Mejr <antero@mailbox.org>
Date: Fri, 17 Nov 2023 16:06:53 +0000
Subject: [PATCH] Move files when using `org-babel-tangle-publish'
Fixes `copy-file' error when publishing to the current directory.
Don't leave behind the old tangled files when publishing.
* lisp/ob-tangle.el (org-babel-tangle-publish): Use `rename-file'
instead of `copy-file' on tangled files.
---
lisp/ob-tangle.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index b30fd9274..e16b9e42d 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -219,7 +219,9 @@ Return list of the tangled file names."
(unless (file-exists-p pub-dir)
(make-directory pub-dir t))
(setq pub-dir (file-name-as-directory pub-dir))
- (mapc (lambda (el) (copy-file el pub-dir t)) (org-babel-tangle-file filename)))
+ ;; Rename files to avoid copying to same file when publishing to ./
+ (mapc (lambda (el) (rename-file el pub-dir t))
+ (org-babel-tangle-file filename)))
;;;###autoload
(defun org-babel-tangle (&optional arg target-file lang-re)
--
2.41.0
next prev parent reply other threads:[~2023-12-08 23:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-17 16:30 [PATCH] Move files when using org-babel-tangle-publish Antero Mejr
2023-12-08 21:36 ` Ihor Radchenko
2023-12-08 23:08 ` Antero Mejr [this message]
2023-12-09 10:29 ` Ihor Radchenko
2023-12-09 17:42 ` Bastien Guerry
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=87v898mgx4.fsf@mailbox.org \
--to=antero@mailbox.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).