Update copyright year to 2015

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

diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index e709600ee8b131c4f29923b894dfb98f3bfb1372..f861194482036eed5571ec2fe888c5279ff67bee 100644 (file)
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/ob-emacs-lisp.el
@@ -1,11 +1,10 @@
 ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc
+;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 
 ;; This file is part of GNU Emacs.
 
@@ -28,7 +27,6 @@
 
 ;;; Code:
 (require 'ob)
-(eval-when-compile (require 'ob-comint))
 
 (defvar org-babel-default-header-args:emacs-lisp
   '((:hlines . "yes") (:colnames . "no"))
@@ -43,12 +41,12 @@
          (print-level nil) (print-length nil)
          (body (if (> (length vars) 0)
                   (concat "(let ("
-                        (mapconcat
-                         (lambda (var)
-                           (format "%S" (print `(,(car var) ',(cdr var)))))
-                         vars "\n      ")
-                        ")\n" body ")")
-                body)))
+                          (mapconcat
+                           (lambda (var)
+                             (format "%S" (print `(,(car var) ',(cdr var)))))
+                           vars "\n      ")
+                          ")\n" body "\n)")
+                (concat body "\n"))))
     (if (or (member "code" result-params)
            (member "pp" result-params))
        (concat "(pp " body ")") body)))
@@ -56,23 +54,26 @@
 (defun org-babel-execute:emacs-lisp (body params)
   "Execute a block of emacs-lisp code with Babel."
   (save-window-excursion
-    ((lambda (result)
-       (if (or (member "scalar" (cdr (assoc :result-params params)))
-              (member "verbatim" (cdr (assoc :result-params params))))
-          (let ((print-level nil)
-                (print-length nil))
-            (format "%S" result))
-        (org-babel-reassemble-table
-         result
-         (org-babel-pick-name (cdr (assoc :colname-names params))
-                              (cdr (assoc :colnames params)))
-         (org-babel-pick-name (cdr (assoc :rowname-names params))
-                              (cdr (assoc :rownames params))))))
-     (eval (read (format (if (member "output"
-                                    (cdr (assoc :result-params params)))
-                            "(with-output-to-string %s)"
-                          "(progn %s)")
-                        (org-babel-expand-body:emacs-lisp body params)))))))
+    (let ((result
+           (eval (read (format (if (member "output"
+                                           (cdr (assoc :result-params params)))
+                                   "(with-output-to-string %s)"
+                                 "(progn %s)")
+                               (org-babel-expand-body:emacs-lisp
+                                body params))))))
+      (org-babel-result-cond (cdr (assoc :result-params params))
+       (let ((print-level nil)
+              (print-length nil))
+          (if (or (member "scalar" (cdr (assoc :result-params params)))
+                  (member "verbatim" (cdr (assoc :result-params params))))
+              (format "%S" result)
+            (format "%s" result)))
+       (org-babel-reassemble-table
+        result
+         (org-babel-pick-name (cdr (assoc :colname-names params))
+                              (cdr (assoc :colnames params)))
+         (org-babel-pick-name (cdr (assoc :rowname-names params))
+                              (cdr (assoc :rownames params))))))))
 
 (provide 'ob-emacs-lisp)