diff options
author | Eric Schulte <schulte.eric@gmail.com> | 2010-07-12 22:26:25 -0700 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2010-07-12 22:26:25 -0700 |
commit | c53fc7d246c20d29ef3f0d626a54b9852e14a3fd (patch) | |
tree | de2c6808e4d309a3309541bc1be9939925de6ece | |
parent | e3aaaec91c2797e81eb09a31f4e60e59c46671a4 (diff) | |
download | org-mode-c53fc7d246c20d29ef3f0d626a54b9852e14a3fd.tar.gz |
babel: consolidate execution messaging into ob.el
* lisp/ob.el (org-babel-execute-src-block): consolidate execution
messaging into ob.el rather than spread out amongst all the language
files
-rw-r--r-- | lisp/ob-C.el | 1 | ||||
-rw-r--r-- | lisp/ob-R.el | 1 | ||||
-rw-r--r-- | lisp/ob-asymptote.el | 1 | ||||
-rw-r--r-- | lisp/ob-css.el | 4 | ||||
-rw-r--r-- | lisp/ob-ditaa.el | 1 | ||||
-rw-r--r-- | lisp/ob-dot.el | 1 | ||||
-rw-r--r-- | lisp/ob-emacs-lisp.el | 1 | ||||
-rw-r--r-- | lisp/ob-gnuplot.el | 1 | ||||
-rw-r--r-- | lisp/ob-haskell.el | 1 | ||||
-rw-r--r-- | lisp/ob-latex.el | 1 | ||||
-rw-r--r-- | lisp/ob-mscgen.el | 1 | ||||
-rw-r--r-- | lisp/ob-ocaml.el | 1 | ||||
-rw-r--r-- | lisp/ob-octave.el | 1 | ||||
-rw-r--r-- | lisp/ob-perl.el | 1 | ||||
-rw-r--r-- | lisp/ob-python.el | 1 | ||||
-rw-r--r-- | lisp/ob-ruby.el | 1 | ||||
-rw-r--r-- | lisp/ob-sass.el | 1 | ||||
-rw-r--r-- | lisp/ob-sh.el | 1 | ||||
-rw-r--r-- | lisp/ob-sql.el | 1 | ||||
-rw-r--r-- | lisp/ob-sqlite.el | 1 | ||||
-rw-r--r-- | lisp/ob.el | 5 |
21 files changed, 5 insertions, 23 deletions
diff --git a/lisp/ob-C.el b/lisp/ob-C.el index fed688e..fa2312d 100644 --- a/lisp/ob-C.el +++ b/lisp/ob-C.el @@ -83,7 +83,6 @@ header arguments (calls `org-babel-C-expand')." (defun org-babel-C-execute (body params) "This function should only be called by `org-babel-execute:C' or `org-babel-execute:c++'." - (message "executing C source code block") (let* ((processed-params (org-babel-process-params params)) (tmp-src-file (make-temp-file "org-babel-C-src" nil (cond diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 8403483..fee1c04 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -83,7 +83,6 @@ (defun org-babel-execute:R (body params) "Execute a block of R code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing R source code block...") (save-excursion (let* ((processed-params (org-babel-process-params params)) (result-type (nth 3 processed-params)) diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el index da11fe4..8399e5a 100644 --- a/lisp/ob-asymptote.el +++ b/lisp/ob-asymptote.el @@ -65,7 +65,6 @@ (defun org-babel-execute:asymptote (body params) "Execute a block of Asymptote code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Asymptote source code block") (let* ((processed-params (org-babel-process-params params)) (result-params (split-string (or (cdr (assoc :results params)) ""))) (out-file (cdr (assoc :file params))) diff --git a/lisp/ob-css.el b/lisp/ob-css.el index 5785622..c73bbef 100644 --- a/lisp/ob-css.el +++ b/lisp/ob-css.el @@ -37,9 +37,7 @@ (defun org-babel-execute:css (body params) "Execute a block of CSS code with org-babel. This function is -called by `org-babel-execute-src-block'." - (message "executing CSS source code block") - body) +called by `org-babel-execute-src-block'." body) (defun org-babel-prep-session:css (session params) "Prepare SESSION according to the header arguments specified in PARAMS." diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el index 1f56d12..3da2c75 100644 --- a/lisp/ob-ditaa.el +++ b/lisp/ob-ditaa.el @@ -50,7 +50,6 @@ (defun org-babel-execute:ditaa (body params) "Execute a block of Ditaa code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Ditaa source code block") (let ((result-params (split-string (or (cdr (assoc :results params)) ""))) (out-file (cdr (assoc :file params))) (cmdline (cdr (assoc :cmdline params))) diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el index a42f451..26db2d3 100644 --- a/lisp/ob-dot.el +++ b/lisp/ob-dot.el @@ -52,7 +52,6 @@ (defun org-babel-execute:dot (body params) "Execute a block of Dot code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Dot source code block") (let ((result-params (split-string (or (cdr (assoc :results params)) ""))) (out-file (cdr (assoc :file params))) (cmdline (cdr (assoc :cmdline params))) diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el index 81ee22e..d2b5602 100644 --- a/lisp/ob-emacs-lisp.el +++ b/lisp/ob-emacs-lisp.el @@ -58,7 +58,6 @@ (defun org-babel-execute:emacs-lisp (body params) "Execute a block of emacs-lisp code with org-babel." - (message "executing emacs-lisp code block...") (save-window-excursion (let ((processed-params (org-babel-process-params params))) (org-babel-reassemble-table diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el index cb1af6b..4e0aef6 100644 --- a/lisp/ob-gnuplot.el +++ b/lisp/ob-gnuplot.el @@ -132,7 +132,6 @@ code." (defun org-babel-execute:gnuplot (body params) "Execute a block of Gnuplot code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Gnuplot source code block") (require 'gnuplot) (let ((session (cdr (assoc :session params))) (result-type (cdr (assoc :results params))) diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el index c380f1b..e191940 100644 --- a/lisp/ob-haskell.el +++ b/lisp/ob-haskell.el @@ -71,7 +71,6 @@ (defun org-babel-execute:haskell (body params) "Execute a block of Haskell code with org-babel." - (message "executing haskell source code block") (let* ((processed-params (org-babel-process-params params)) (session (nth 0 processed-params)) (vars (nth 1 processed-params)) diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el index b08e3a4..65c09a1 100644 --- a/lisp/ob-latex.el +++ b/lisp/ob-latex.el @@ -60,7 +60,6 @@ (defun org-babel-execute:latex (body params) "Execute a block of Latex code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Latex source code block") (setq body (org-babel-expand-body:latex body params)) (if (cdr (assoc :file params)) (let ((out-file (cdr (assoc :file params))) diff --git a/lisp/ob-mscgen.el b/lisp/ob-mscgen.el index 3c2b790..8428ce6 100644 --- a/lisp/ob-mscgen.el +++ b/lisp/ob-mscgen.el @@ -70,7 +70,6 @@ is called by `org-babel-execute-src-block'. Default filetype is png. Modify by setting :filetype parameter to mscgen supported formats." - (message "executing Mscgen source code block") (let* ((out-file (or (cdr (assoc :file params)) "output.png" )) (filetype (or (cdr (assoc :filetype params)) "png" ))) (unless (cdr (assoc :file params)) diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el index 140c98d..8cdffc9 100644 --- a/lisp/ob-ocaml.el +++ b/lisp/ob-ocaml.el @@ -60,7 +60,6 @@ (defun org-babel-execute:ocaml (body params) "Execute a block of Ocaml code with org-babel." - (message "executing ocaml source code block") (let* ((processed-params (org-babel-process-params params)) (vars (nth 1 processed-params)) (full-body (org-babel-expand-body:ocaml body params processed-params)) diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index e50b74f..ab60932 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -89,7 +89,6 @@ end") (org-babel-execute:octave body params 'matlab)) (defun org-babel-execute:octave (body params &optional matlabp) "Execute a block of octave code with org-babel." - (message "executing %s source code block" (if matlabp "matlab" "octave")) (let* ((processed-params (org-babel-process-params params)) (session (funcall (intern (format "org-babel-%s-initiate-session" diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el index a8d4a8e..3749295 100644 --- a/lisp/ob-perl.el +++ b/lisp/ob-perl.el @@ -52,7 +52,6 @@ (defun org-babel-execute:perl (body params) "Execute a block of Perl code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Perl source code block") (let* ((processed-params (org-babel-process-params params)) (session (nth 0 processed-params)) (vars (nth 1 processed-params)) diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 39208fb..d8fd758 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -61,7 +61,6 @@ (defun org-babel-execute:python (body params) "Execute a block of Python code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Python source code block") (let* ((processed-params (org-babel-process-params params)) (session (org-babel-python-initiate-session (first processed-params))) (result-params (nth 2 processed-params)) diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 5f06d4c..ef2ad46 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -67,7 +67,6 @@ (defun org-babel-execute:ruby (body params) "Execute a block of Ruby code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Ruby source code block") (let* ((processed-params (org-babel-process-params params)) (session (org-babel-ruby-initiate-session (first processed-params))) (result-params (nth 2 processed-params)) diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el index e762d3d..78177ad 100644 --- a/lisp/ob-sass.el +++ b/lisp/ob-sass.el @@ -49,7 +49,6 @@ (defun org-babel-execute:sass (body params) "Execute a block of Sass code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Sass source code block") (let* ((result-params (split-string (or (cdr (assoc :results params)) ""))) (file (cdr (assoc :file params))) (out-file (or file (make-temp-file "org-babel-sass-out"))) diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el index 669c654..5748171 100644 --- a/lisp/ob-sh.el +++ b/lisp/ob-sh.el @@ -61,7 +61,6 @@ (defun org-babel-execute:sh (body params) "Execute a block of Shell commands with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Shell source code block") (let* ((processed-params (org-babel-process-params params)) (session (org-babel-sh-initiate-session (nth 0 processed-params))) (result-params (nth 2 processed-params)) diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index e42b6cb..634c5af 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -56,7 +56,6 @@ (defun org-babel-execute:sql (body params) "Execute a block of Sql code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Sql source code block") (let* ((result-params (split-string (or (cdr (assoc :results params)) ""))) (processed-params (org-babel-process-params params)) (cmdline (cdr (assoc :cmdline params))) diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el index 378ade6..0f01bc8 100644 --- a/lisp/ob-sqlite.el +++ b/lisp/ob-sqlite.el @@ -50,7 +50,6 @@ (defun org-babel-execute:sqlite (body params) "Execute a block of Sqlite code with org-babel. This function is called by `org-babel-execute-src-block'." - (message "executing Sqlite source code block") (let ((result-params (split-string (or (cdr (assoc :results params)) ""))) (vars (org-babel-ref-variables params)) (db (cdr (assoc :db params))) @@ -350,7 +350,10 @@ block." (setq result (org-babel-read-result)) (message (replace-regexp-in-string "%" "%%" (format "%S" result))) result) - (setq result (funcall cmd body params)) + (message "executing %s code block%s..." + (capitalize lang) + (if (nth 4 info) (format " (%s)" (nth 4 info)) "")) + (setq result (funcall cmd body params)) (if (eq result-type 'value) (setq result (if (and (or (member "vector" result-params) (member "table" result-params)) |