branch: elpa/exec-path-from-shell
commit 76cd6e3fa8a7dac937af7e40507843dfae4f9184
Author: Steve Purcell <[email protected]>
Commit: Steve Purcell <[email protected]>
Don't use -i by default with Fish (see #87)
---
exec-path-from-shell.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/exec-path-from-shell.el b/exec-path-from-shell.el
index 40cf8f6c39..98692b76c1 100644
--- a/exec-path-from-shell.el
+++ b/exec-path-from-shell.el
@@ -119,9 +119,12 @@ See documentation for `exec-path-from-shell-shell-name'."
(error "SHELL environment variable is unset")))
(defcustom exec-path-from-shell-arguments
- (if (string-match-p "t?csh$" (exec-path-from-shell--shell))
- (list "-d")
- (list "-l" "-i"))
+ (let ((shell (exec-path-from-shell--shell)))
+ (if (string-match-p "t?csh$" shell)
+ (list "-d")
+ (if (string-match-p "fish" shell)
+ (list "-l")
+ (list "-l" "-i"))))
"Additional arguments to pass to the shell.
The default value denotes an interactive login shell."
