From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 9 Jan 2013 12:48:30 +0000 (+0100)
Subject: ob-eval.el (org-babel-shell-command-on-region): Use `executable-find' for local ... 
X-Git-Tag: release_7.9.3b~5
X-Git-Url: https://repo.or.cz/w/org-mode.git/commitdiff_plain/79dd795fe4abb5fdcc1340194b25b958342b8c66

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

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

diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index 5884d33d7..22d2bcf28 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -137,11 +137,17 @@ specifies the value of ERROR-BUFFER."
 		       t)))
   (let ((input-file (org-babel-temp-file "input-"))
 	(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
-	 (if (file-executable-p
-	      (concat (file-remote-p default-directory) shell-file-name))
-	     shell-file-name
-	   "/bin/sh"))
+	 (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))
+		shell-file-name)
+	       ("/bin/sh")))
 	exit-status)
     ;; 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