Merge pull request #147 from fktpp2022/main

fix autoload for windows
necaris · May 28, 2023 · f3ea387 · f3ea387
2 parents f90598f + 22017e7
commit f3ea387
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/conda.el b/conda.el
@@ -126,10 +126,8 @@ Cached for the lifetime of the process."
       conda--executable-path
     (setq conda--executable-path
           (cond
-           ((file-executable-p (f-join conda-anaconda-home conda-env-executables-dir "conda"))
-            (f-join conda-anaconda-home conda-env-executables-dir "conda"))
-           ((file-executable-p (f-join conda-anaconda-home conda-env-executables-dir "mamba"))
-            (f-join conda-anaconda-home conda-env-executables-dir "mamba"))
+           ((locate-file "conda" (list (f-join conda-anaconda-home conda-env-executables-dir)) exec-suffixes 'executable))
+	   ((locate-file "mamba" (list (f-join conda-anaconda-home conda-env-executables-dir)) exec-suffixes 'executable))
            ((executable-find "conda"))
            ((executable-find "mamba"))
            (t (error