re-use isa/interface-setup.el rather than separate isar version;

3 files changed, 3 insertions, 17 deletions

diff --git a/isar/interface b/isar/interface
index 38adfa7a..1247b935 100644
--- a/isar/interface
+++ b/isar/interface
@@ -104,7 +104,7 @@ else
 fi
 
 
-ARGS="$ARGS -l $PROOFGENERAL_HOME/isar/interface-setup.el"
+ARGS="$ARGS -l $PROOFGENERAL_HOME/isa/interface-setup.el"
 ARGS="$ARGS -l $PROOFGENERAL_HOME/generic/proof-site.el"
 
 for FILE in "$ISABELLE_HOME/etc/proofgeneral-settings.el" \
diff --git a/isar/interface-setup.el b/isar/interface-setup.el
deleted file mode 100644
index 9fdaba2b..00000000
--- a/isar/interface-setup.el
+++ /dev/null
@@ -1,14 +0,0 @@
-;;
-;; $Id$
-;; 
-
-(customize-set-variable
- 'isabelle-isar-prog-name
- (concat (getenv "ISABELLE") " " (getenv "PROOFGENERAL_LOGIC")))
-
-(let ((xsym (getenv "PROOFGENERAL_XSYMBOL")))
-  (cond
-   ((equal xsym "true")
-    (customize-set-variable 'proof-x-symbol-enable t))
-   ((equal xsym "false")
-    (customize-set-variable 'proof-x-symbol-enable nil))))
diff --git a/isar/isar.el b/isar/isar.el
index ebd89ce0..48ac8325 100644
--- a/isar/isar.el
+++ b/isar/isar.el
@@ -59,7 +59,7 @@
 ;;; 'isabelle-isar-config  -  Configuration of Isabelle/Isar Proof General
 ;;;	   		      (constants, but may be nice to tweak)
 
-(defcustom isabelle-isar-prog-name "isabelle"
+(defcustom isabelle-prog-name "isabelle"
   "*Name of program to run Isabelle/Isar."
   :type 'file
   :group 'isabelle-isar)
@@ -539,7 +539,7 @@ proof-shell-retract-files-regexp."
     ans))
 
 (defun isar-pre-shell-start ()
-  (setq proof-prog-name		isabelle-isar-prog-name)
+  (setq proof-prog-name		isabelle-prog-name)
   (setq proof-mode-for-shell    'isar-shell-mode)
   (setq proof-mode-for-goals	'isar-goals-mode)
   (setq proof-mode-for-response 'isar-response-mode))