diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-06-18 23:31:15 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-06-19 00:38:22 +0200 |
commit | ce19c05e347aaefd8f1a9952e5fcd1d96b2d0cc6 (patch) | |
tree | 1a3c82a8ae50a0b867d9873036c8a4f4b45fb7b2 | |
parent | 72d4c3db2d46d1dc81dff78ebb87dee21bbe9aa6 (diff) | |
download | org-mode-ce19c05e347aaefd8f1a9952e5fcd1d96b2d0cc6.tar.gz |
ob-exp: Use lexical binding
* lisp/ob-exp.el (org-babel-exp-src-block): Use `eval' with optional
LEXICAL argument.
(org-babel-exp-process-buffer): Remove unused bindings.
-rw-r--r-- | lisp/ob-exp.el | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index f2c18f6..f3c1e49 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -1,4 +1,4 @@ -;;; ob-exp.el --- Exportation of org-babel source blocks +;;; ob-exp.el --- Exportation of Babel Source Blocks -*- lexical-binding: t; -*- ;; Copyright (C) 2009-2016 Free Software Foundation, Inc. @@ -95,13 +95,13 @@ Assume point is at block opening line." (let ((lang-headers (intern (concat "org-babel-default-header-args:" lang)))) (org-babel-exp--at-source - (setf (nth 2 info) - (org-babel-process-params - (apply #'org-babel-merge-params - org-babel-default-header-args - (and (boundp lang-headers) (eval lang-headers)) - (append (org-babel-params-from-properties lang) - (list raw-params))))))) + (setf (nth 2 info) + (org-babel-process-params + (apply #'org-babel-merge-params + org-babel-default-header-args + (and (boundp lang-headers) (eval lang-headers t)) + (append (org-babel-params-from-properties lang) + (list raw-params))))))) (setf hash (org-babel-sha1-hash info))) (org-babel-exp-do-export info 'block hash))))) @@ -196,10 +196,9 @@ this template." (delete-region begin end) (insert replacement))))) ((or `babel-call `inline-babel-call) - (let ((results (org-babel-exp-do-export - (org-babel-lob-get-info element) - 'lob)) - (rep + (org-babel-exp-do-export (org-babel-lob-get-info element) + 'lob) + (let ((rep (org-fill-template org-babel-exp-call-line-template `(("line" . @@ -224,14 +223,8 @@ this template." (delete-region begin end) (insert rep)))) (`src-block - (let* ((match-start (copy-marker (match-beginning 0))) - (ind (org-get-indentation)) - (lang - (or (org-element-property :language element) - (user-error - "No language for src block: %s" - (or (org-element-property :name element) - "(unnamed)"))))) + (let ((match-start (copy-marker (match-beginning 0))) + (ind (org-get-indentation))) ;; Take care of matched block: compute ;; replacement string. In particular, a nil ;; REPLACEMENT means the block is left as-is |