Re: [PATCH] Omit file description when :file-desc has nil value

[Matt Huszagh]

Matt Huszagh <huszaghmatt@gmail.com> writes:

> This patch omits a file description when :file-desc has a nil
> value.

I've modified the patch to yield the same effect when executing a source
block.

Matt

>From 24d156e421973b5a97f1c797d48f1daa95348898 Mon Sep 17 00:00:00 2001
From: Matt Huszagh <huszaghmatt@gmail.com>
Date: Wed, 2 Sep 2020 23:06:10 -0700
Subject: [PATCH] lisp/ob-core.el: Omit file description when :file-desc has
 nil value

* lisp/ob-core.el (org-babel-insert-result): Omit file description
when :file-desc value evaluates to nil.
(org-babel-execute-src-block): Perform the same functionality when
executing a src block.

The previous implementation makes it impossible to provide a default
:file-desc and in some cases override it to omit the description.
---
 lisp/ob-core.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 578622232..02c0a153c 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -750,7 +750,8 @@ block."
                                    (org-babel-result-to-file
                                     file
                                     (let ((desc (assq :file-desc params)))
-                                      (and desc (or (cdr desc) result)))))))
+                                      (and (and desc (cdr desc))
+                                           (cdr desc)))))))
                      (setq result (org-babel-ref-resolve post))
                      (when file
                        (setq result-params (remove "file" result-params))))))
@@ -2257,9 +2258,9 @@ INFO may provide the values of these header arguments (in 
the
         (setq result (org-no-properties result))
         (when (member "file" result-params)
           (setq result (org-babel-result-to-file
-                        result (when (assq :file-desc (nth 2 info))
-                                 (or (cdr (assq :file-desc (nth 2 info)))
-                                     result))))))
+                        result (when (and (assq :file-desc (nth 2 info))
+                                          (cdr (assq :file-desc (nth 2 info))))
+                                 (cdr (assq :file-desc (nth 2 info))))))))
        ((listp result))
        (t (setq result (format "%S" result))))
   (if (and result-params (member "silent" result-params))
-- 
2.28.0