From 22017e74e5f91919e318b14fe3fcd0ec0befe9f3 Mon Sep 17 00:00:00 2001 From: Kai Fan Date: Sun, 28 May 2023 20:40:48 +0800 Subject: [PATCH] fix autoload for windows --- conda.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conda.el b/conda.el index 2f438ac..ab46fb0 100644 --- 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