diff options
Diffstat (limited to 'lisp/org/ob-eval.el')
| -rw-r--r-- | lisp/org/ob-eval.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el index afa880bd90c..5884d33d786 100644 --- a/lisp/org/ob-eval.el +++ b/lisp/org/ob-eval.el | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | (eval-when-compile (require 'cl)) | 30 | (eval-when-compile (require 'cl)) |
| 31 | 31 | ||
| 32 | (defvar org-babel-error-buffer-name "*Org-Babel Error Output*") | 32 | (defvar org-babel-error-buffer-name "*Org-Babel Error Output*") |
| 33 | (declare-function org-babel-temp-file "ob-core" (prefix &optional suffix)) | ||
| 33 | 34 | ||
| 34 | (defun org-babel-eval-error-notify (exit-code stderr) | 35 | (defun org-babel-eval-error-notify (exit-code stderr) |
| 35 | "Open a buffer to display STDERR and a message with the value of EXIT-CODE." | 36 | "Open a buffer to display STDERR and a message with the value of EXIT-CODE." |
| @@ -142,6 +143,11 @@ specifies the value of ERROR-BUFFER." | |||
| 142 | shell-file-name | 143 | shell-file-name |
| 143 | "/bin/sh")) | 144 | "/bin/sh")) |
| 144 | exit-status) | 145 | exit-status) |
| 146 | ;; There is an error in `process-file' when `error-file' exists. | ||
| 147 | ;; This is fixed in Emacs trunk as of 2012-12-21; let's use this | ||
| 148 | ;; workaround for now. | ||
| 149 | (unless (file-remote-p default-directory) | ||
| 150 | (delete-file error-file)) | ||
| 145 | (if (or replace | 151 | (if (or replace |
| 146 | (and output-buffer | 152 | (and output-buffer |
| 147 | (not (or (bufferp output-buffer) (stringp output-buffer))))) | 153 | (not (or (bufferp output-buffer) (stringp output-buffer))))) |