ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2014-01-09 00:03:06 +01:00
parent 248bc714b5 87234bee55
commit 0652a10bf3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ob-sql.el
View File

@ -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 "")))

3
lisp/ox-md.el
View File

@ -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))))))