# HG changeset patch
# User Carsten Dominik <carsten.dominik@gmail.com>
# Date 1289536594 21600
# Node ID 45f3703e90f2069077e2ebe045ae40cd7031fbf5
# Parent  9248407310efbd3fa96560bce8f292845c69b1e8
Fix ob-lisp.el expectation that slime would be available

diff -r 9248407310ef -r 45f3703e90f2 lisp/org/ChangeLog
--- a/lisp/org/ChangeLog	Thu Nov 11 22:13:11 2010 -0600
+++ b/lisp/org/ChangeLog	Thu Nov 11 22:36:34 2010 -0600
@@ -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 -r 9248407310ef -r 45f3703e90f2 lisp/org/ob-lisp.el
--- a/lisp/org/ob-lisp.el	Thu Nov 11 22:13:11 2010 -0600
+++ b/lisp/org/ob-lisp.el	Thu Nov 11 22:36:34 2010 -0600
@@ -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.")