mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-20 15:48:31 +00:00
17edaf8c14
* etc/ORG-NEWS (Maxima: new headers ~:prologue~ and ~:epilogue~):
(Texinfo exports inline source blocks as ~@code{}~):
(Default lexical evaluation of emacs-lisp source blocks):
* lisp/ob-clojure.el (org-babel-clojure-default-ns):
* lisp/ob-core.el (org-babel-named-src-block-regexp-for-name):
(org-babel-current-src-block-location):
(org-babel-mark-block):
(org-babel-insert-result):
* lisp/ob-emacs-lisp.el (org-babel-default-header-args:emacs-lisp):
* lisp/ob-exp.el (org-babel-exp-process-buffer):
* lisp/ob-lob.el (org-babel-lob-ingest):
* lisp/ob-ref.el:
* lisp/org-element.el (org-element-object-restrictions):
(org-element-src-block-parser):
(org-element-inline-src-block-parser):
* lisp/org-lint.el:
(org-lint--checkers):
* lisp/org-pcomplete.el (pcomplete/org-mode/block-option/src):
* lisp/org-src.el (org-edit-inline-src-code):
* lisp/org.el (org-ctrl-c-ctrl-c):
(org-in-src-block-p):
(org-fill-element):
* lisp/ox-html.el (org-html--textarea-block):
(org-html-format-code):
* lisp/ox-latex.el (org-latex-minted-options):
(org-latex-custom-lang-environments):
* lisp/ox-md.el:
* lisp/ox-odt.el (org-odt-format-code):
* lisp/ox.el (org-export-collect-listings):
* testing/lisp/test-ob-exp.el (ob-exp/src-block-with-affiliated-keyword):
* testing/lisp/test-ob.el (test-ob/preserve-results-indentation):
Correct "src block" occurrences when they do not specifically refer
to the element type `src-block'.
92 lines
3.1 KiB
EmacsLisp
92 lines
3.1 KiB
EmacsLisp
;;; ob-emacs-lisp.el --- Babel Functions for Emacs-lisp Code -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2009-2018 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric Schulte
|
|
;; Keywords: literate programming, reproducible research
|
|
;; Homepage: https://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 <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Org-Babel support for evaluating emacs-lisp code
|
|
|
|
;;; Code:
|
|
(require 'ob)
|
|
|
|
(defconst org-babel-header-args:emacs-lisp '((lexical . :any))
|
|
"Emacs-lisp specific header arguments.")
|
|
|
|
(defvar org-babel-default-header-args:emacs-lisp '((:lexical . "no"))
|
|
"Default arguments for evaluating an emacs-lisp source block.
|
|
|
|
A value of \"yes\" or t causes source blocks to be eval'd using
|
|
lexical scoping. It can also be an alist mapping symbols to
|
|
their value. It is used as the optional LEXICAL argument to
|
|
`eval', which see.")
|
|
|
|
(defun org-babel-expand-body:emacs-lisp (body params)
|
|
"Expand BODY according to PARAMS, return the expanded body."
|
|
(let ((vars (org-babel--get-vars params))
|
|
(print-level nil)
|
|
(print-length nil))
|
|
(if (null vars) (concat body "\n")
|
|
(format "(let (%s)\n%s\n)"
|
|
(mapconcat
|
|
(lambda (var)
|
|
(format "%S" (print `(,(car var) ',(cdr var)))))
|
|
vars "\n ")
|
|
body))))
|
|
|
|
(defun org-babel-execute:emacs-lisp (body params)
|
|
"Execute a block of emacs-lisp code with Babel."
|
|
(save-window-excursion
|
|
(let* ((lexical (cdr (assq :lexical params)))
|
|
(result-params (cdr (assq :result-params params)))
|
|
(body (format (if (member "output" result-params)
|
|
"(with-output-to-string %s\n)"
|
|
"(progn %s\n)")
|
|
(org-babel-expand-body:emacs-lisp body params)))
|
|
(result (eval (read (if (or (member "code" result-params)
|
|
(member "pp" result-params))
|
|
(concat "(pp " body ")")
|
|
body))
|
|
(if (listp lexical)
|
|
lexical
|
|
(member lexical '("yes" "t"))))))
|
|
(org-babel-result-cond result-params
|
|
(let ((print-level nil)
|
|
(print-length nil))
|
|
(if (or (member "scalar" result-params)
|
|
(member "verbatim" result-params))
|
|
(format "%S" result)
|
|
(format "%s" result)))
|
|
(org-babel-reassemble-table
|
|
result
|
|
(org-babel-pick-name (cdr (assq :colname-names params))
|
|
(cdr (assq :colnames params)))
|
|
(org-babel-pick-name (cdr (assq :rowname-names params))
|
|
(cdr (assq :rownames params))))))))
|
|
|
|
(org-babel-make-language-alias "elisp" "emacs-lisp")
|
|
|
|
(provide 'ob-emacs-lisp)
|
|
|
|
|
|
|
|
;;; ob-emacs-lisp.el ends here
|