File tree Expand file tree Collapse file tree 1 file changed +4
-9
lines changed Expand file tree Collapse file tree 1 file changed +4
-9
lines changed Original file line number Diff line number Diff line change @@ -535,15 +535,10 @@ to be loaded by ghci."
535
535
(defun haskell-process-type ()
536
536
" Return `haskell-process-type' , or a guess if that variable is 'auto."
537
537
(if (eq 'auto haskell-process-type)
538
- (let ((nix-shell-found (locate-dominating-file default-directory
539
- (lambda (f )
540
- (string= " shell.nix" f))))
541
- (cabal-found (locate-dominating-file default-directory
542
- (lambda (f )
543
- (or (string= " .cabal-sandbox" f)
544
- (string-match-p " \\ .cabal\\ '" f))))))
545
- (cond ((and cabal-found nix-shell-found) 'nix-shell-cabal-repl )
546
- (cabal-found 'cabal-repl )
538
+ (let ((nix-shell-found (locate-dominating-file default-directory " shell.nix" ))
539
+ (cabal-sandbox-found (locate-dominating-file default-directory " .cabal-sandbox" )))
540
+ (cond ((and cabal-sandbox-found nix-shell-found) 'nix-shell-cabal-repl )
541
+ (cabal-sandbox-found 'cabal-repl )
547
542
(nix-shell-found 'nix-shell-ghci )
548
543
(t 'ghci )))
549
544
haskell-process-type))
You can’t perform that action at this time.
0 commit comments