* 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 408ca4e64c4a694471d34d97c975fff32ca1d53d..84d6bb26bae9773bb6ae6a25b600978e24f09e62 100644 (file)
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -1,11 +1,10 @@
 ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
 
-;; Copyright (C) 2010-2011  Free Software Foundation
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
 
 ;; This file is part of GNU Emacs.
 
@@ -89,11 +88,19 @@ This function is called by `org-babel-execute-src-block'."
        ;; body of the code block
        (org-babel-expand-body:sqlite body params)))
       (if (or (member "scalar" result-params)
+             (member "verbatim" result-params)
              (member "html" result-params)
              (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))))))
@@ -145,4 +152,5 @@ Prepare SESSION according to the header arguments specified in PARAMS."
 (provide 'ob-sqlite)
 
 
+
 ;;; ob-sqlite.el ends here