emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/python: fix conda+repl integration #1494

Browse source
This commit is contained in:
Henrik Lissner 2019-06-15 00:38:13 +02:00
parent 9624595f35
commit c705ceeb4c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/lang/python/autoload/python.el
View file

@ -48,7 +48,7 @@
(if (file-exists-p bin) bin)))) (if (file-exists-p bin) bin))))
((when (require 'conda nil t) ((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-default-location))))
(if (file-executable-p bin) bin)))) (if (file-executable-p bin) bin))))
((when-let* ((bin (projectile-locate-dominating-file default-directory "bin/python"))) ((when-let* ((bin (projectile-locate-dominating-file default-directory "bin/python")))
(setq-local doom-modeline-python-executable (expand-file-name "bin/python" bin)))) (setq-local doom-modeline-python-executable (expand-file-name "bin/python" bin))))