diff options
author | Bastien Guerry <bzg@gnu.org> | 2013-11-12 14:06:26 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@gnu.org> | 2013-11-12 14:06:26 +0100 |
commit | 271672fad74cdbc9065d23d6e6cee1b8540f571b (patch) | |
tree | d322b956ec0e74ee33b22354ef00839b23b1618d /lisp/org/ob-comint.el | |
parent | f201cf3a8143b0b34b07769fc7d73dd14761b87b (diff) | |
download | emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.tar.gz |
Merge Org version 8.2.3a.
Diffstat (limited to 'lisp/org/ob-comint.el')
-rw-r--r-- | lisp/org/ob-comint.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el index 5ea3be2d5b6..8b03e2dcc40 100644 --- a/lisp/org/ob-comint.el +++ b/lisp/org/ob-comint.el @@ -30,7 +30,7 @@ ;; org-babel at large. ;;; Code: -(require 'ob) +(require 'ob-core) (require 'org-compat) (require 'comint) (eval-when-compile (require 'cl)) @@ -117,7 +117,7 @@ or user `keyboard-quit' during execution of body." string-buffer)) (setq raw (substring string-buffer (match-end 0)))) (split-string string-buffer comint-prompt-regexp))))) -(def-edebug-spec org-babel-comint-with-output (form body)) +(def-edebug-spec org-babel-comint-with-output (sexp body)) (defun org-babel-comint-input-command (buffer cmd) "Pass CMD to BUFFER. |