summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-12-01 07:19:45 -0700
committerEric Schulte <schulte.eric@gmail.com>2010-12-01 07:19:45 -0700
commita9a77780dcae0c233df78de12cf6f256513e0afd (patch)
tree71c2ce19d18870b5a320657795a5eabd300112ce
parent232651a57eecea842c57e0f6a104fbb391d00452 (diff)
downloadorg-mode-a9a77780dcae0c233df78de12cf6f256513e0afd.tar.gz
change requirement order to ob-eval is always loaded
* lisp/ob-eval.el (require): No longer require ob.el to allow requiring by ob.el. * lisp/ob.el (ob-eval): Require ob-eval.
-rw-r--r--lisp/ob-eval.el1
-rw-r--r--lisp/ob.el2
2 files changed, 1 insertions, 2 deletions
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index 8832d91..340cb8b 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -28,7 +28,6 @@
;; shell commands.
;;; Code:
-(require 'ob)
(eval-when-compile (require 'cl))
(defvar org-babel-error-buffer-name "*Org-Babel Error Output*")
diff --git a/lisp/ob.el b/lisp/ob.el
index 51ad3cf..3d097b4 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -32,6 +32,7 @@
(eval-when-compile
(require 'org-list)
(require 'cl))
+(require 'ob-eval)
(require 'org-macs)
(defvar org-babel-call-process-region-original)
@@ -78,7 +79,6 @@
(declare-function org-list-to-generic "org-list" (LIST PARAMS))
(declare-function org-list-bottom-point "org-list" ())
-(declare-function org-babel-eval-wipe-error-buffer "ob-eval" ())
(defgroup org-babel nil
"Code block evaluation and management in `org-mode' documents."
:tag "Babel"