From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Fri, 12 Nov 2010 04:36:34 +0000 (-0600)
Subject: Fix ob-lisp.el expectation that slime would be available
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~276
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=537c0c7219fa072fb7d62acf3c30ac844f7e8ac7;p=emacs.git

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

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 90bf8e56a9b..e1440fabd8b 100644
--- 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 f550a54e1e3..ebe2f2f758f 100644
--- 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.")