* lisp/loadup.el: Count byte-code functions as well.

[gnu-emacs] / lisp / org / ob-sqlite.el

diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index d3a336a8af0cf071cef7426075e198f444e3c52e..84d6bb26bae9773bb6ae6a25b600978e24f09e62 100644 (file)
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -1,6 +1,6 @@
 ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
 
-;; Copyright (C) 2010-2012  Free Software Foundation
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -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))))))