mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-11-25 07:27:57 +00:00
3096cc3b61
* lisp/ob-emacs-lisp.el: A comment on the last line of an emacs-lisp code block would cause an error when the block is was executed. This fix cures this behaviour. * testing/lisp/test-ob-emacs-lisp.el: Regression tests for the above fix.
81 lines
2.7 KiB
EmacsLisp
81 lines
2.7 KiB
EmacsLisp
;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
|
|
|
|
;; Copyright (C) 2009-2011 Free Software Foundation, Inc
|
|
|
|
;; Author: Eric Schulte
|
|
;; Keywords: literate programming, reproducible research
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Org-Babel support for evaluating emacs-lisp code
|
|
|
|
;;; Code:
|
|
(require 'ob)
|
|
(eval-when-compile (require 'ob-comint))
|
|
|
|
(defvar org-babel-default-header-args:emacs-lisp
|
|
'((:hlines . "yes") (:colnames . "no"))
|
|
"Default arguments for evaluating an emacs-lisp source block.")
|
|
|
|
(declare-function orgtbl-to-generic "org-table" (table params))
|
|
|
|
(defun org-babel-expand-body:emacs-lisp (body params)
|
|
"Expand BODY according to PARAMS, return the expanded body."
|
|
(let* ((vars (mapcar #'cdr (org-babel-get-header params :var)))
|
|
(result-params (cdr (assoc :result-params params)))
|
|
(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 "\n)")
|
|
(concat body "\n"))))
|
|
(if (or (member "code" result-params)
|
|
(member "pp" result-params))
|
|
(concat "(pp " body ")") body)))
|
|
|
|
(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)))))))
|
|
|
|
(provide 'ob-emacs-lisp)
|
|
|
|
|
|
|
|
;;; ob-emacs-lisp.el ends here
|