merge trunk

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

diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 064aad539c2b51265ae627e4f0e9307bd704da99..efdac4d3818ccf8dfe9f1ceb19ec9b760fa46396 100644 (file)
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -1,11 +1,11 @@
 ;;; ob-comint.el --- org-babel functions for interaction with comint buffers
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; 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...
@@ -158,6 +158,6 @@ FILE exists at end of evaluation."
 
 (provide 'ob-comint)
 
-;; arch-tag: 9adddce6-0864-4be3-b0b5-6c5157dc7889
+
 
 ;;; ob-comint.el ends here