merge trunk

[gnu-emacs] / lisp / org / ob-comint.el

diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 7607f8029140e1b71a7689491a00e26676a5b1f2..efdac4d3818ccf8dfe9f1ceb19ec9b760fa46396 100644 (file)
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
+;; Version: 7.7
 
 ;; This file is part of GNU Emacs.
 
@@ -93,9 +93,9 @@ or user `keyboard-quit' during execution of body."
                          (goto-char comint-last-input-end)
                          (not (save-excursion
                                 (and (re-search-forward
-                                      comint-prompt-regexp nil t)
+                                      (regexp-quote ,eoe-indicator) nil t)
                                      (re-search-forward
-                                      (regexp-quote ,eoe-indicator) nil t)))))
+                                      comint-prompt-regexp nil t)))))
                   (accept-process-output (get-buffer-process (current-buffer)))
                   ;; thought the following this would allow async
                   ;; background running, but I was wrong...
@@ -159,4 +159,5 @@ FILE exists at end of evaluation."
 (provide 'ob-comint)
 
 
+
 ;;; ob-comint.el ends here