From 35321e8b42cf0200ca8b5c97372ae0cfa5705565 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 5 Mar 2019 02:30:14 -0500 Subject: [PATCH] Fix conda python version detection in first buffer Reported by @ztlevi --- modules/lang/python/autoload/python.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/python/autoload/python.el b/modules/lang/python/autoload/python.el index 753f0f636..84fcbcecd 100644 --- a/modules/lang/python/autoload/python.el +++ b/modules/lang/python/autoload/python.el @@ -45,7 +45,7 @@ (cond ((when python-shell-virtualenv-root (let ((bin (expand-file-name exe-root python-shell-virtualenv-root))) (if (file-exists-p bin) bin)))) - ((when (bound-and-true-p conda-env-current-name) + ((when (require 'conda nil t) (let ((bin (expand-file-name (concat conda-env-current-name "/" exe-root) (conda-env-location)))) (if (file-executable-p bin) bin))))