mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-15 18:16:26 +00:00
Code Releases Activity

ob-eval.el (org-babel-shell-command-on-region): Use executable-find' for local shell-file-name'

Browse source 
* ob-eval.el (org-babel-shell-command-on-region): Use
`executable-find' for local `shell-file-name'.
This commit is contained in:
Michael Albinus 2013-01-09 13:48:30 +01:00 committed by Bastien Guerry
parent 31e765a105
commit 79dd795fe4
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/ob-eval.el
View file

@ -137,11 +137,17 @@ specifies the value of ERROR-BUFFER."
t))) t)))
(let ((input-file (org-babel-temp-file "input-")) (let ((input-file (org-babel-temp-file "input-"))
(error-file (if error-buffer (org-babel-temp-file "scor-") nil)) (error-file (if error-buffer (org-babel-temp-file "scor-") nil))
;; Unfortunately, `executable-find' does not support file name
;; handlers. Therefore, we could use it in the local case
;; only.
(shell-file-name (shell-file-name
(if (file-executable-p (cond ((and (not (file-remote-p default-directory))
(executable-find shell-file-name))
shell-file-name)
((file-executable-p
(concat (file-remote-p default-directory) shell-file-name)) (concat (file-remote-p default-directory) shell-file-name))
shell-file-name shell-file-name)
"/bin/sh")) ("/bin/sh")))
exit-status) exit-status)
;; There is an error in `process-file' when `error-file' exists. ;; There is an error in `process-file' when `error-file' exists.
;; This is fixed in Emacs trunk as of 2012-12-21; let's use this ;; This is fixed in Emacs trunk as of 2012-12-21; let's use this