Revert "org-babel-comint-with-output is now fully self-contained and side-effect free"

This seems to be causing problems...

This reverts commit 0573fc4d9c.
This commit is contained in:
Eric Schulte 2009-06-11 12:55:39 -07:00
parent dc551fab04
commit 2081b95410
1 changed files with 8 additions and 8 deletions

View File

@ -51,15 +51,15 @@ body inside the protection of `save-window-excursion' and
(set-buffer buffer) (set-buffer buffer)
,@body))) ,@body)))
(defun org-babel-comint-append-output-filter (text)
(setq string-buffer (concat string-buffer text)))
(defmacro org-babel-comint-with-output (&rest body) (defmacro org-babel-comint-with-output (&rest body)
(let ((my-filter (gensym "org-babel-comint-filter"))) `(let ((string-buffer ""))
`(let ((string-buffer "")) (add-hook 'comint-output-filter-functions 'org-babel-comint-append-output-filter)
(flet ((,my-filter (text) (condition-case nil (progn ,@body) (t))
(setq string-buffer (concat string-buffer text)))) (remove-hook 'comint-output-filter-functions 'org-babel-comint-append-output-filter)
(add-hook 'comint-output-filter-functions ',my-filter) string-buffer))
(condition-case nil (progn ,@body) (t))
(remove-hook 'comint-output-filter-functions ',my-filter))
string-buffer)))
(defun org-babel-comint-command-to-output (buffer cmd) (defun org-babel-comint-command-to-output (buffer cmd)
"Pass CMD to BUFFER using `org-babel-comint-input-command', and "Pass CMD to BUFFER using `org-babel-comint-input-command', and