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 4ff9c4076ecd8abbe191918241ac5eda99d14d36..71e80bdf9ea7c6f7af8c3b9a78c026c08e067e35 100644 (file)
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -1,13 +1,12 @@
 ;;; ob-lisp.el --- org-babel functions for common lisp evaluation
 
-;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland
-;;     Eric Schulte
-;;     David T. O'Toole <dto@gnu.org>
+;; Authors: Joel Boehland
+;;      Eric Schulte
+;;      David T. O'Toole <dto@gnu.org>
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 
 ;; This file is part of GNU Emacs.
 
@@ -42,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)"
@@ -50,6 +49,7 @@
 For example a value of \"(progn ;; %s\\n   %%s)\" would ignore the
 current directory string."
   :group 'org-babel
+  :version "24.1"
   :type 'string)
 
 (defun org-babel-expand-body:lisp (body params)
@@ -79,14 +79,14 @@ current directory string."
       (if (member "output" (cdr (assoc :result-params params)))
          (car result)
        (condition-case nil
-           (read (org-bable-lisp-vector-to-list (cadr result)))
+           (read (org-babel-lisp-vector-to-list (cadr result)))
          (error (cadr result)))))
     (with-temp-buffer
       (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
@@ -97,7 +97,7 @@ current directory string."
    (org-babel-pick-name (cdr (assoc :rowname-names params))
                        (cdr (assoc :rownames params)))))
 
-(defun org-bable-lisp-vector-to-list (results)
+(defun org-babel-lisp-vector-to-list (results)
   ;; TODO: better would be to replace #(...) with [...]
   (replace-regexp-in-string "#(" "(" results))