From 0ddf7aa6bc1691407032ee44e5225a7af0a72c4a Mon Sep 17 00:00:00 2001
From: Raphael Roberts <raphael.roberts48@gmail.com>
Date: Thu, 10 Oct 2019 02:05:45 -0500
Subject: [PATCH] Untested python fixes

---
 settings.org | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/settings.org b/settings.org
index 64f7541..61d8637 100644
--- a/settings.org
+++ b/settings.org
@@ -308,6 +308,9 @@ This handy function is a customized ripoff of custom-save-all
 		(write-file vc-ignore-file)))
 	    (vc-ignore ".dir-locals.el"))))))
 
+  (defun rlbr/get-python-executable ()
+    (read-file-name "Python interpreter to use: " (file-name-directory (executable-find "python")) nil nil "python"))
+
   (defun rlbr/init-python-venv-in-library-root (&optional library-root)
     "Prompt to either create one or use default"
     (let ((venv-name (rlbr/get-venv-name))
@@ -316,22 +319,36 @@ This handy function is a customized ripoff of custom-save-all
 			  (elpy-library-root))))
       (setq venv-name (rlbr/handle-name-conflicts venv-name))
       (if (y-or-n-p (format "Create venv '%s'?" venv-name))
-	  (pyvenv-create venv-name (read-file-name "Python interpreter to use: "
-						   (file-name-directory (executable-find "python"))
-						   nil nil "python"))
+	  (pyvenv-create venv-name (rlbr/get-python-executable))
 	(progn
 	  (unless (member "emacs-default-venv" (pyvenv-virtualenv-list))
-	    (pyvenv-create venv-name (read-file-name "Python interpreter to use: "
-						     (file-name-directory (executable-find "python"))
-						     nil nil "python")))
+	    (pyvenv-create venv-name (rlbr/get-python-executable)))
 	  (setq venv-name "emacs-default-venv")))
       (rlbr/setup-python-venv-dirlocals library-root venv-name)
       venv-name))
 
   (defun rlbr/init-venv ()
     (when (eq major-mode 'python-mode)
-      (unless (or pyvenv-workon (apply 'string-prefix-p (mapcar 'file-truename (list (pyvenv-workon-home) buffer-file-name))))
-	(setq-local pyvenv-workon (rlbr/init-python-venv-in-library-root)))))
+      (unless (apply
+	       'string-prefix-p
+	       (mapcar
+		'file-truename
+		(list
+		 (pyvenv-workon-home)
+		 buffer-file-name)))
+	(if (and pyvenv-workon (not (member pyvenv-workon (pyvenv-virtualenv-list))))
+	    (if (y-or-n-p
+		 (format "Venv '%s' is specified but does not exist. Create it?" pyvenv-workon))
+		(pyvenv-create pyvenv-workon (rlbr/get-python-executable))
+	      ((rlbr/save-buffer-func-to-file
+		(let ((default-directory (elpy-library-root)))
+		  (expand-file-name
+		   ".dir-locals.el"))
+		'delete-dir-local-variable
+		'(python pyvenv-workon))))
+	  (setq-local
+	   pyvenv-workon
+	   (rlbr/init-python-venv-in-library-root)))))))
 #+END_SRC
 *** bindings/settings
 #+BEGIN_SRC emacs-lisp