[nongnu] elpa/exec-path-from-shell c6eedaf916 071/114: Merge pull request #62 from Fuco1/patch-1

[ELPA Syncer]

branch: elpa/exec-path-from-shell
commit c6eedaf916f763a68cbb7fdaf9c7af568546d4b9
Merge: 9def990ba4 1d373ba14c
Author: Steve Purcell <steve@sanityinc.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #62 from Fuco1/patch-1
    
    Fix defcustom for exec-path-from-shell-shell-name
---
 exec-path-from-shell.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/exec-path-from-shell.el b/exec-path-from-shell.el
index d9cd0a234f..3384897516 100644
--- a/exec-path-from-shell.el
+++ b/exec-path-from-shell.el
@@ -94,7 +94,9 @@ Environment variables should be set in .profile or .zshenv 
rather than
   "If non-nil, use this shell executable.
 Otherwise, use either `shell-file-name' (if set), or the value of
 the SHELL environment variable."
-  :type 'file
+  :type '(choice
+          (file :tag "Shell executable")
+          (const :tag "Use `shell-file-name' or $SHELL" nil))
   :group 'exec-path-from-shell)
 
 (defvar exec-path-from-shell-debug nil