diff options
author | Bastien Guerry <bzg@altern.org> | 2012-08-10 16:05:26 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-08-10 16:05:26 +0200 |
commit | 966447c4549bcc168647cd257204d2e62bf1b52b (patch) | |
tree | 2218645026ee8704c53886e4c1d9ed2fb95df751 | |
parent | 1edf05f14cb8cc26bdce716f9170b2f4ee0e6723 (diff) | |
download | org-mode-966447c4549bcc168647cd257204d2e62bf1b52b.tar.gz |
Don't use `org-flet' in ob-awk.el and ob-sh.el
* ob-awk.el (org-babel-awk-var-to-awk): Don't use `org-flet'.
* ob-sh.el (org-babel-sh-var-to-string): Ditto.
-rw-r--r-- | lisp/ob-awk.el | 8 | ||||
-rw-r--r-- | lisp/ob-sh.el | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el index de94a56..6e13996 100644 --- a/lisp/ob-awk.el +++ b/lisp/ob-awk.el @@ -97,13 +97,13 @@ called by `org-babel-execute-src-block'" (defun org-babel-awk-var-to-awk (var &optional sep) "Return a printed value of VAR suitable for parsing with awk." - (org-flet ((echo-var (v) (if (stringp v) v (format "%S" v)))) + (let ((echo-var (lambda (v) (if (stringp v) v (format "%S" v))))) (cond ((and (listp var) (listp (car var))) - (orgtbl-to-generic var (list :sep (or sep "\t") :fmt #'echo-var))) + (orgtbl-to-generic var (list :sep (or sep "\t") :fmt echo-var))) ((listp var) - (mapconcat #'echo-var var "\n")) - (t (echo-var var))))) + (mapconcat echo-var var "\n")) + (t (funcall echo-var var))))) (defun org-babel-awk-table-or-string (results) "If the results look like a table, then convert them into an diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el index f531447..4071385 100644 --- a/lisp/ob-sh.el +++ b/lisp/ob-sh.el @@ -107,13 +107,13 @@ var of the same value." (defun org-babel-sh-var-to-string (var &optional sep) "Convert an elisp value to a string." - (org-flet ((echo-var (v) (if (stringp v) v (format "%S" v)))) + (let ((echo-var (lambda (v) (if (stringp v) v (format "%S" v))))) (cond ((and (listp var) (listp (car var))) - (orgtbl-to-generic var (list :sep (or sep "\t") :fmt #'echo-var))) + (orgtbl-to-generic var (list :sep (or sep "\t") :fmt echo-var))) ((listp var) - (mapconcat #'echo-var var "\n")) - (t (echo-var var))))) + (mapconcat echo-var var "\n")) + (t (funcall echo-var var))))) (defun org-babel-sh-table-or-results (results) "Convert RESULTS to an appropriate elisp value. |