Fix ob-lisp.el expectation that slime would be available

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 90bf8e56a9b9cfae9c98f9f4f301a0cc7c0b8a94..e1440fabd8becd6e03213644a05e3ec5e27c43ef 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-12  Carsten Dominik  <carsten.dominik@gmail.com>
+
+       * ob-lisp.el (slime): Don't expect slime to be present.
+
 2010-11-11  Dan Davison  <dandavison7@gmail.com>
 
        * ob.el: `copy-sequence' suffices to copy alist; no need for

diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index f550a54e1e33a28e0a200f2704a914b49a7686b4..ebe2f2f758f16e590eea4487725294de79c4b99a 100644 (file)
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -41,7 +41,10 @@
 (require 'ob-ref)
 (require 'ob-comint)
 (require 'ob-eval)
-(require 'slime)
+(declare-function slime-eval "ext:slime" (form))
+(declare-function slime-connected-p "ext:slime" ())
+(declare-function slime-process "ext:slime" ())
+(require 'slime nil 'noerror)
 
 (defvar org-babel-default-header-args:lisp '()
   "Default header arguments for lisp code blocks.")