From 9e306dbb39325998a5149840b229ffa802ec40e9 Mon Sep 17 00:00:00 2001 From: Ernesto Durante Date: Mon, 25 Aug 2014 17:54:51 +0200 Subject: [PATCH 2/3] org-babel-eval: showing Microsoft Visual C++ errors --- lisp/ob-eval.el | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el index 9fbbb42..0e69583 100644 --- a/lisp/ob-eval.el +++ b/lisp/ob-eval.el @@ -53,18 +53,21 @@ STDERR with `org-babel-eval-error-notify'." (setq exit-code (org-babel--shell-command-on-region (point-min) (point-max) cmd err-buff)) - (if (or (not (numberp exit-code)) (> exit-code 0)) - (progn - (with-current-buffer err-buff - (org-babel-eval-error-notify exit-code (buffer-string))) - (save-excursion - (when (get-buffer org-babel-error-buffer-name) - (with-current-buffer org-babel-error-buffer-name - (compilation-mode) - ;;compilation-mode enforces read-only - (read-only-mode 0)))) - nil) - (buffer-string))))) + (let ((outb-str (buffer-string))) + ;;outb-str holds standard output + body + (if (or (not (numberp exit-code)) (> exit-code 0)) + (progn + (with-current-buffer err-buff + (org-babel-eval-error-notify exit-code + (concat outb-str (buffer-string)))) + (save-excursion + (when (get-buffer org-babel-error-buffer-name) + (with-current-buffer org-babel-error-buffer-name + (compilation-mode) + ;;compilation-mode enforces read-only + (read-only-mode 0)))) + nil) + outb-str))))) (defun org-babel-eval-read-file (file) "Return the contents of FILE as a string." -- 1.8.3.1