1 files changed, 25 insertions, 2 deletions
diff --git a/phox/phox.el b/phox/phox.el
index 1b9e85c0..b0b57f3e 100644
--- a/phox/phox.el
+++ b/phox/phox.el
@@ -32,8 +32,13 @@
   :type 'file
   :group 'phox)
 
-(defcustom phox-sym-lock t
-  "*Whether to use sym-lock or not."
+(defcustom phox-sym-lock nil
+  "*Whether to use sym-lock or not (should disappear soon)."
+  :type 'boolean
+  :group 'phox)
+
+(defcustom phox-x-symbol-enable t
+  "*Whether to use x-symbol or not."
   :type 'boolean
   :group 'phox)
 
@@ -262,6 +267,24 @@
   (append phox-top-keywords phox-proof-keywords)
 )
 
+;;;
+;;; X-Symbol
+;;;
+
+(let ((xsymbol (getenv "PROOFGENERAL_XSYMBOL"))
+      (enable-var (if (equal (getenv "PROOFGENERAL_ASSISTANTS") "phox")
+                      'phox-x-symbol-enable)))
+
+  ;; avoid confusing warning message
+  (if (not (boundp 'x-symbol-image-converter))     
+      (customize-set-variable 'x-symbol-image-converter nil))
+  
+  ;; tell Proof General about -x option
+  (if (and xsymbol (not (equal xsymbol "")))
+      (customize-set-variable enable-var (equal xsymbol "true"))))
+
+(defpgdefault x-symbol-language 'phox)
+
 (eval-after-load "x-symbol-phox"
  ;; Add x-symbol tokens to phox-completion-table and rebuild
  ;; internal completion table if completion is already active