summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <eric.schulte@gmx.com>2012-02-18 14:50:31 -0700
committerEric Schulte <eric.schulte@gmx.com>2012-02-18 14:50:31 -0700
commit2239d74fd933a7d0e975be5186735d9d8ab99030 (patch)
tree258ffe7db5f9dc240a88a4093c5ed6890b5fabf3
parentbe4254876394da71476ae7a1008108bf3c0ccc1e (diff)
parent60176c84e5fe5dab9633339d6738312066ade289 (diff)
downloadorg-mode-2239d74fd933a7d0e975be5186735d9d8ab99030.tar.gz
Merge branch 'origin-maint'
-rw-r--r--lisp/ob-sqlite.el9
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index 599113c..84d6bb2 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -93,7 +93,14 @@ This function is called by `org-babel-execute-src-block'."
(member "code" result-params)
(equal (point-min) (point-max)))
(buffer-string)
- (org-table-convert-region (point-min) (point-max))
+ (org-table-convert-region (point-min) (point-max)
+ (if (or (member :csv others)
+ (member :column others)
+ (member :line others)
+ (member :list others)
+ (member :html others) separator)
+ nil
+ '(4)))
(org-babel-sqlite-table-or-scalar
(org-babel-sqlite-offset-colnames
(org-table-to-lisp) headers-p))))))