0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 20:07:46 +00:00

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-04-16 09:25:30 +02:00
commit c3cdbbff9b

View file

@ -149,14 +149,14 @@ SQL Server on Windows and Linux platform."
" ")) " "))
(defun org-babel-sql-convert-standard-filename (file) (defun org-babel-sql-convert-standard-filename (file)
"Convert the file name to OS standard. "Convert FILE to OS standard file name.
If in Cygwin environment, uses Cygwin specific function to If in Cygwin environment, uses Cygwin specific function to
convert the file name. Otherwise, uses Emacs' standard conversion convert the file name. In a Windows-NT environment, do nothing.
function." Otherwise, use Emacs' standard conversion function."
(format "\"%s\"" (cond ((fboundp 'cygwin-convert-file-name-to-windows)
(if (fboundp 'cygwin-convert-file-name-to-windows) (format "%S" (cygwin-convert-file-name-to-windows file)))
(cygwin-convert-file-name-to-windows file) ((string= "windows-nt" system-type) file)
(convert-standard-filename file)))) (t (format "%S" (convert-standard-filename file)))))
(defun org-babel-execute:sql (body params) (defun org-babel-execute:sql (body params)
"Execute a block of Sql code with Babel. "Execute a block of Sql code with Babel.