diff options
| author | Bastien Guerry <bzg@altern.org> | 2014-01-09 00:03:06 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2014-01-09 00:03:06 +0100 |
| commit | 0652a10bf3cce40242e0787a0dab87bfebbcb690 (patch) | |
| tree | 6f4a56c0481d39218b94f8a2f9c7c0b98fff95ce | |
| parent | 248bc714b595cd8982599c8c1b6d6befd9167eff (diff) | |
| parent | 87234bee559039197d791febcaac2155a7fb4304 (diff) | |
| download | org-mode-0652a10bf3cce40242e0787a0dab87bfebbcb690.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | lisp/ob-sql.el | 3 | ||||
| -rw-r--r-- | lisp/ox-md.el | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index bee457b..7b85df8 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -123,7 +123,8 @@ This function is called by `org-babel-execute-src-block'." (org-babel-process-file-name in-file) (org-babel-process-file-name out-file))) ('postgresql (format - "psql --set=\"ON_ERROR_STOP=1\" -A -P footer=off -F \"\t\" -f %s -o %s %s" + "psql --set=\"ON_ERROR_STOP=1\" %s -A -P footer=off -F \"\t\" -f %s -o %s %s" + (if colnames-p "" "-t") (org-babel-process-file-name in-file) (org-babel-process-file-name out-file) (or cmdline ""))) diff --git a/lisp/ox-md.el b/lisp/ox-md.el index ffb3049..0078ae8 100644 --- a/lisp/ox-md.el +++ b/lisp/ox-md.el @@ -255,7 +255,8 @@ a communication channel." (off "[ ] ")) (let ((tag (org-element-property :tag item))) (and tag (format "**%s:** "(org-export-data tag info)))) - (org-trim (replace-regexp-in-string "^" " " contents))))) + (and contents + (org-trim (replace-regexp-in-string "^" " " contents)))))) |