aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Dominik2010-11-11 22:36:34 -0600
committerCarsten Dominik2010-11-11 22:36:34 -0600
commit537c0c7219fa072fb7d62acf3c30ac844f7e8ac7 (patch)
tree00176469d41c50432cbd81229158d7bc005f9951
parentafe98dfa700de5cf0493e8bf95b7d894e2734e47 (diff)
downloademacs-537c0c7219fa072fb7d62acf3c30ac844f7e8ac7.tar.gz
emacs-537c0c7219fa072fb7d62acf3c30ac844f7e8ac7.zip
Fix ob-lisp.el expectation that slime would be available
-rw-r--r--lisp/org/ChangeLog4
-rw-r--r--lisp/org/ob-lisp.el5
2 files changed, 8 insertions, 1 deletions
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 @@
12010-11-12 Carsten Dominik <carsten.dominik@gmail.com>
2
3 * ob-lisp.el (slime): Don't expect slime to be present.
4
12010-11-11 Dan Davison <dandavison7@gmail.com> 52010-11-11 Dan Davison <dandavison7@gmail.com>
2 6
3 * ob.el: `copy-sequence' suffices to copy alist; no need for 7 * 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 @@
41(require 'ob-ref) 41(require 'ob-ref)
42(require 'ob-comint) 42(require 'ob-comint)
43(require 'ob-eval) 43(require 'ob-eval)
44(require 'slime) 44(declare-function slime-eval "ext:slime" (form))
45(declare-function slime-connected-p "ext:slime" ())
46(declare-function slime-process "ext:slime" ())
47(require 'slime nil 'noerror)
45 48
46(defvar org-babel-default-header-args:lisp '() 49(defvar org-babel-default-header-args:lisp '()
47 "Default header arguments for lisp code blocks.") 50 "Default header arguments for lisp code blocks.")