proper evaluation of PROOFGENERAL_ASSISTANTS vs. proof-assistants;

1 files changed, 8 insertions, 8 deletions

diff --git a/generic/proof-site.el b/generic/proof-site.el
index 8a7d5d32..7f3a40a6 100644
--- a/generic/proof-site.el
+++ b/generic/proof-site.el
@@ -136,13 +136,7 @@ If S is nil, return empty list."
 					  s end-of-word-occurence)) 
 		 separator))))))
 
-(defcustom proof-assistants
-  ;; FIXME: we could check that this setting is sensible.
-  (or (mapcar 'intern
-	      (proof-string-to-list
-	       (getenv "PROOFGENERAL_ASSISTANTS") " "))
-      (mapcar (lambda (astnt) (car astnt))
-	      proof-assistant-table))
+(defcustom proof-assistants nil
   (concat
    "*Choice of proof assistants to use with Proof General.
 A list of symbols chosen from:" 
@@ -168,6 +162,7 @@ Note: to change proof assistant, you must start a new Emacs session.")
 		      proof-assistant-table))
   :group 'proof-general)
 
+
 ;; Extend load path for the generic files.
 (let ((proof-lisp-path
        (concat proof-home-directory "generic/")))
@@ -235,7 +230,12 @@ Note: to change proof assistant, you must start a new Emacs session.")
 
 ;; Now add auto-loads and load-path elements to support the 
 ;; proof assistants selected, and define a stub 
-(let ((assistants proof-assistants))
+(let ((assistants
+       (or (mapcar 'intern
+		   (proof-string-to-list
+		    (getenv "PROOFGENERAL_ASSISTANTS") " "))
+	   proof-assistants
+	   (mapcar (lambda (astnt) (car astnt)) proof-assistant-table))))
   (while assistants
     (let*  
 	((assistant (car assistants))	; compiler bogus warning here