65c8c7cb96
* lisp/cedet/srecode/insert.el (data-debug-new-buffer) (data-debug-insert-stuff-list, data-debug-insert-thing): * lisp/emulation/viper-ex.el (viper-change-state-to-vi) (viper-change-state-to-emacs): * lisp/emulation/viper-macs.el (viper-change-state-to-vi): * lisp/org/ob-asymptote.el (orgtbl-to-generic): * lisp/org/ob-awk.el (orgtbl-to-generic): * lisp/org/ob-core.el (org-edit-src-code, orgtbl-to-generic): * lisp/org/ob-emacs-lisp.el (orgtbl-to-generic): * lisp/org/ob-exp.el (org-element-context): * lisp/org/ob-gnuplot.el (org-time-string-to-time) (orgtbl-to-generic): * lisp/org/ob-haskell.el (org-export-to-file): * lisp/org/ob-latex.el (org-create-formula-image) (org-latex-compile): * lisp/org/ob-python.el (run-python): * lisp/org/ob-sh.el (orgtbl-to-generic): * lisp/org/ob-tangle.el (org-link-escape, org-back-to-heading): * lisp/org/org-colview.el (org-agenda-redo): * lisp/org/org-feed.el (url-retrieve-synchronously): * lisp/org/org-info.el (Info-find-node): * lisp/org/org-list.el (org-previous-line-empty-p): * lisp/org/org-macs.el (org-string-match-p): * lisp/org/org.el (org-beamer-mode): Fix prototype to match current definition. * lisp/emacs-lisp/advice.el (function-called-at-point): * lisp/progmodes/prolog.el (compilation-shell-minor-mode): Fix typo: extra '. * lisp/emacs-lisp/cl-generic.el (cl-defmethod): Insert ,' to pacify check-declare. * lisp/org/ob-comint.el (tramp-flush-directory-property): * lisp/org/ob-tangle.el (org-babel-update-block-body): * lisp/org/org-bibtex.el (org-babel-trim): * lisp/org/org-pcomplete.el (org-export-backend-options): * lisp/org/org-protocol.el (org-publish-get-project-from-filename): Fix file name in declare-function. * lisp/org/ob-comint.el (with-parsed-tramp-file-name) * lisp/org/ob-core.el (with-parsed-tramp-file-name): * lisp/org/org.el (org-beamer-mode): * lisp/url/url-http.el (gnutls-negotiate): Append ‘t’ to declare-function, since the declaration isn’t a defun. * lisp/org/ob-core.el (show-all): Declare outline-show-all instead, since it is the non-obsolete version of this function. (org-save-outline-visibility): Remove; not needed. * lisp/org/ob-scheme.el (run-geiser, geiser-mode) (geiser-eval-region, geiser-repl-exit): * lisp/org/ox-org.el (htmlize-buffer): Prepend "ext:" to file name, since it is not part of Emacs. * lisp/org/ob-sh.el (org-babel-comint-in-buffer) * lisp/org/org-gnus.el (nnimap-group-overview-filename): Remove decl, since function was removed. * lisp/org/ob-sh.el (org-babel-comint-with-output): * lisp/org/org-macro.el (org-with-wide-buffer): Omit unnecessary (and mismatching) decl. * lisp/org/org-agenda.el (calendar-absolute-from-iso): * lisp/org/org-clock.el (calendar-iso-to-absolute): Declare calendar-iso-to-absolute instead, since it is the non-obsolete version of this function. * lisp/org/org-compat.el (w32-focus-frame): Remove decl, since function is now obsolete.
83 lines
3 KiB
EmacsLisp
83 lines
3 KiB
EmacsLisp
;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
|
|
|
|
;; Copyright (C) 2009-2016 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)
|
|
|
|
(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 &optional backend))
|
|
|
|
(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
|
|
(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)
|
|
|
|
|
|
|
|
;;; ob-emacs-lisp.el ends here
|