[Emacs-diffs] /srv/bzr/emacs/trunk r102355: Fix ob-lisp.el expectation that slime would be available

[Carsten Dominik]

------------------------------------------------------------
revno: 102355
committer: Carsten Dominik <address@hidden>
branch nick: trunk
timestamp: Thu 2010-11-11 22:36:34 -0600
message:
  Fix ob-lisp.el expectation that slime would be available
modified:
  lisp/org/ChangeLog
  lisp/org/ob-lisp.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2010-11-12 04:10:19 +0000
+++ b/lisp/org/ChangeLog        2010-11-12 04:36:34 +0000
@@ -1,3 +1,7 @@
+2010-11-12  Carsten Dominik  <address@hidden>
+
+       * ob-lisp.el (slime): Don't expect slime to be present.
+
 2010-11-11  Dan Davison  <address@hidden>
 
        * ob.el: `copy-sequence' suffices to copy alist; no need for

=== modified file 'lisp/org/ob-lisp.el'
--- a/lisp/org/ob-lisp.el       2010-11-12 04:10:19 +0000
+++ b/lisp/org/ob-lisp.el       2010-11-12 04:36:34 +0000
@@ -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.")