Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo.

[gnu-emacs] / lisp / org / ob-lisp.el

diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 8fb6721969291beb5f162f0568f0da040b7b97a5..71e80bdf9ea7c6f7af8c3b9a78c026c08e067e35 100644 (file)
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -41,7 +41,7 @@
 (add-to-list 'org-babel-tangle-lang-exts '("lisp" . "lisp"))
 
 (defvar org-babel-default-header-args:lisp '())
-(defvar org-babel-header-arg-names:lisp '(package))
+(defvar org-babel-header-args:lisp '((package . :any)))
 
 (defcustom org-babel-lisp-dir-fmt
   "(let ((*default-pathname-defaults* #P%S)) %%s)"
@@ -85,8 +85,8 @@ current directory string."
       (insert (org-babel-expand-body:lisp body params))
       (slime-eval `(swank:eval-and-grab-output
                    ,(let ((dir (if (assoc :dir params)
-                                           (cdr (assoc :dir params))
-                                         default-directory)))
+                                   (cdr (assoc :dir params))
+                                 default-directory)))
                       (format
                        (if dir (format org-babel-lisp-dir-fmt dir) "(progn %s)")
                        (buffer-substring-no-properties