branch: externals/org
commit a2ae06986981e2588e0692c6b7bb048be7c2882d
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
ob-*: Do not emit redundant messages about code block evaluation
* lisp/ob-C.el (org-babel-C-header-to-C):
* lisp/ob-awk.el (org-babel-execute:awk):
* lisp/ob-ditaa.el (org-babel-execute:ditaa):
* lisp/ob-gnuplot.el (org-babel-execute:gnuplot):
(org-babel-prep-session:gnuplot):
* lisp/ob-groovy.el (org-babel-execute:groovy):
* lisp/ob-maxima.el (org-babel-execute:maxima):
* lisp/ob-screen.el (org-babel-execute:screen):
* lisp/ob-sed.el (org-babel-execute:sed):
`org-babel-execute-src-block' already emits status messages about code
block evaluation. Doing it from inside individual babel backends is
thus redundant.
---
lisp/ob-C.el | 1 -
lisp/ob-awk.el | 1 -
lisp/ob-ditaa.el | 3 +--
lisp/ob-gnuplot.el | 5 +----
lisp/ob-groovy.el | 1 -
lisp/ob-maxima.el | 2 --
lisp/ob-screen.el | 1 -
lisp/ob-sed.el | 1 -
8 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index f7735ee72b..cecaa60e7d 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -482,7 +482,6 @@ int get_column_num (int nbcols, const char** header, const
char* column)
(defun org-babel-C-header-to-C (head type)
"Convert an elisp list of header table into a C or D vector
specifying a variable with the name of the table."
- (unless noninteractive (message "%S" type))
(let ((table (car head))
(headers (cdr head))
(typename (pcase type
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index d94da405f0..0c07aec829 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -61,7 +61,6 @@
"Execute a block of Awk code BODY with org-babel.
PARAMS is a plist of src block parameters .
This function is called by `org-babel-execute-src-block'."
- (unless noninteractive (message "Executing Awk source code block"))
(let* ((result-params (cdr (assq :result-params params)))
(cmd-line (cdr (assq :cmd-line params)))
(in-file (cdr (assq :in-file params)))
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index 715d8ddf07..cc01d7e280 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -113,9 +113,8 @@ This function is called by `org-babel-execute-src-block'."
(unless (file-exists-p org-ditaa-jar-path)
(error "Could not find ditaa.jar at %s" org-ditaa-jar-path))
(with-temp-file in-file (insert body))
- (unless noninteractive (message cmd))
(shell-command cmd)
- (when pdf-cmd (unless noninteractive (message pdf-cmd)) (shell-command
pdf-cmd))
+ (when pdf-cmd (shell-command pdf-cmd))
nil)) ;; signal that output has already been written to file
(defun org-babel-prep-session:ditaa (_session _params)
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 956763c587..1fe99dd162 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -210,7 +210,6 @@ This function is called by `org-babel-execute-src-block'."
(let ((script-file (org-babel-temp-file "gnuplot-script-")))
(with-temp-file script-file
(insert (concat body "\n")))
- (unless noninteractive (message "gnuplot \"%s\"" script-file))
(setq output
(shell-command-to-string
(format
@@ -218,8 +217,7 @@ This function is called by `org-babel-execute-src-block'."
(org-babel-process-file-name
script-file
(if (member system-type '(cygwin windows-nt ms-dos))
- t nil)))))
- (unless noninteractive (message "%s" output)))
+ t nil))))))
(with-temp-buffer
(insert (concat body "\n"))
(gnuplot-mode)
@@ -232,7 +230,6 @@ This function is called by `org-babel-execute-src-block'."
"Prepare SESSION according to the header arguments in PARAMS."
(let* ((session (org-babel-gnuplot-initiate-session session))
(var-lines (org-babel-variable-assignments:gnuplot params)))
- (unless noninteractive (message "%S" session))
(org-babel-comint-in-buffer session
(dolist (var-line var-lines)
(insert var-line)
diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el
index d87ef4bb65..73b0d33fcf 100644
--- a/lisp/ob-groovy.el
+++ b/lisp/ob-groovy.el
@@ -52,7 +52,6 @@ parameters may be used, like groovy -v"
(defun org-babel-execute:groovy (body params)
"Execute Groovy BODY according to PARAMS.
This function is called by `org-babel-execute-src-block'."
- (unless noninteractive (message "Executing Groovy source code block"))
(let* ((processed-params (org-babel-process-params params))
(session (org-babel-groovy-initiate-session (nth 0 processed-params)))
(result-params (nth 2 processed-params))
diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el
index 681154adfb..afd615f8d0 100644
--- a/lisp/ob-maxima.el
+++ b/lisp/ob-maxima.el
@@ -131,7 +131,6 @@ Return nil if LINE is zero-length or it matches a regexp in
(defun org-babel-execute:maxima (body params)
"Execute Maxima BODY according to PARAMS.
This function is called by `org-babel-execute-src-block'."
- (unless noninteractive (message "Executing Maxima source code block"))
(let ((result-params (split-string (or (cdr (assq :results params)) "")))
(result
(let* ((cmdline (or (cdr (assq :cmdline params)) ""))
@@ -151,7 +150,6 @@ This function is called by `org-babel-execute-src-block'."
(format "(linenum:0, %s(%S))$" batch/load
in-file))
cmdline)))
(with-temp-file in-file (insert (org-babel-maxima-expand body
params)))
- (unless noninteractive (message cmd))
;; " | grep -v batch | grep -v 'replaced' | sed '/^$/d' "
(let ((raw (org-babel-eval cmd "")))
(mapconcat
diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el
index a56afc7050..c9dc3b39e5 100644
--- a/lisp/ob-screen.el
+++ b/lisp/ob-screen.el
@@ -52,7 +52,6 @@ In case you want to use a different screen than one selected
by your $PATH")
(defun org-babel-execute:screen (body params)
"Send BODY via screen to a terminal using Babel, according to PARAMS.
\"default\" session is used when none is specified in the PARAMS."
- (unless noninteractive (message "Sending source code block to interactive
terminal session..."))
(save-window-excursion
(let* ((session (cdr (assq :session params)))
(socket (org-babel-screen-session-socketname session)))
diff --git a/lisp/ob-sed.el b/lisp/ob-sed.el
index 83d9684ade..495f2b3e31 100644
--- a/lisp/ob-sed.el
+++ b/lisp/ob-sed.el
@@ -65,7 +65,6 @@
BODY is the source inside a sed source block and PARAMS is an
association list over the source block configurations. This
function is called by `org-babel-execute-src-block'."
- (unless noninteractive (message "Executing sed source code block"))
(let* ((result-params (cdr (assq :result-params params)))
(cmd-line (cdr (assq :cmd-line params)))
(in-file (cdr (assq :in-file params)))
