diff options
author | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
commit | bdebdb64b35d6a0a28e04335f4e8e46949206ad3 (patch) | |
tree | ea3e0d00bd8da93ae89e86744a80f4e162c5361c /lisp/org/ob-sql.el | |
parent | ccc83f50a4ca55842bcf955b9f8156c17aa43864 (diff) | |
download | emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.gz emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.bz2 emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.zip |
Merge upstream Org (from commit acbbe2)
Diffstat (limited to 'lisp/org/ob-sql.el')
-rw-r--r-- | lisp/org/ob-sql.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el index ad7b1e29a93..20a136a80fb 100644 --- a/lisp/org/ob-sql.el +++ b/lisp/org/ob-sql.el @@ -47,7 +47,8 @@ (eval-when-compile (require 'cl)) (declare-function org-table-import "org-table" (file arg)) -(declare-function orgtbl-to-csv "org-table" (TABLE PARAMS)) +(declare-function orgtbl-to-csv "org-table" (table params)) +(declare-function org-table-to-lisp "org-table" (&optional txt)) (defvar org-babel-default-header-args:sql '()) |