branch: elpa/exec-path-from-shell
commit 17fe8465cdc2c951d1c7d1daae40194d01b8eb43
Merge: c2ca275d32 c2a727fe34
Author: Steve Purcell <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #44 from ksjogo/master
fix defcustom loading when env SHELL is empty
---
exec-path-from-shell.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/exec-path-from-shell.el b/exec-path-from-shell.el
index 73e0b17af0..0f2c797ffd 100644
--- a/exec-path-from-shell.el
+++ b/exec-path-from-shell.el
@@ -97,7 +97,7 @@ Environment variables should be set in .profile or .zshenv
rather than
(concat "\"" (replace-regexp-in-string "\"" "\\\\\"" s) "\""))
(defcustom exec-path-from-shell-arguments
- (if (string-match-p "t?csh$" (getenv "SHELL"))
+ (if (string-match-p "t?csh$" (or (getenv "SHELL") ""))
(list "-d")
(list "-l" "-i"))
"Additional arguments to pass to the shell.
