mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge changes from Org 7.4 to current Org 7.7.

Browse source
This commit is contained in:
Bastien Guerry 2011-07-28 17:13:49 +02:00
parent 44a8054f97
commit 3ab2c837b3
104 changed files with 18444 additions and 6673 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/org/ob-sqlite.el
View file

@ -1,11 +1,11 @@
;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
;; Copyright (C) 2010-2011 Free Software Foundation
;; Copyright (C) 2010 Free Software Foundation
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 7.4
;; Version: 7.7
;; This file is part of GNU Emacs.
@ -89,6 +89,7 @@ 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)))
@ -144,5 +145,6 @@ Prepare SESSION according to the header arguments specified in PARAMS."
(provide 'ob-sqlite)
;; arch-tag: 5c03d7f2-0f72-48b8-bbd1-35aafea248ac
;;; ob-sqlite.el ends here