Fix conda python version detection in first buffer

Reported by @ztlevi
This commit is contained in:
Henrik Lissner 2019-03-05 02:30:14 -05:00
parent 4f40e67e28
commit 35321e8b42
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -45,7 +45,7 @@
(cond ((when python-shell-virtualenv-root (cond ((when python-shell-virtualenv-root
(let ((bin (expand-file-name exe-root python-shell-virtualenv-root))) (let ((bin (expand-file-name exe-root python-shell-virtualenv-root)))
(if (file-exists-p bin) bin)))) (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) (let ((bin (expand-file-name (concat conda-env-current-name "/" exe-root)
(conda-env-location)))) (conda-env-location))))
(if (file-executable-p bin) bin)))) (if (file-executable-p bin) bin))))