0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 19:10:43 +00:00

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

This commit is contained in:
Bastien Guerry 2012-09-29 23:46:30 +02:00
commit 50caf97422

View file

@ -190,7 +190,8 @@ return the value of the last statement in BODY."
(list org-babel-sh-eoe-indicator)))) (list org-babel-sh-eoe-indicator))))
2)) "\n")) 2)) "\n"))
('otherwise ; external shell script ('otherwise ; external shell script
(if (cdr (assoc :shebang params)) (if (and (cdr (assoc :shebang params))
(> (length (cdr (assoc :shebang params))) 0))
(let ((script-file (org-babel-temp-file "sh-script-")) (let ((script-file (org-babel-temp-file "sh-script-"))
(shebang (cdr (assoc :shebang params))) (shebang (cdr (assoc :shebang params)))
(padline (not (string= "no" (cdr (assoc :padline params)))))) (padline (not (string= "no" (cdr (assoc :padline params))))))