diff options
| -rw-r--r-- | generic/proof-site.el | 4 | ||||
| -rw-r--r-- | isa/interface | 6 | ||||
| -rw-r--r-- | isa/interface-setup.el | 2 | ||||
| -rw-r--r-- | isar/interface | 4 | ||||
| -rw-r--r-- | isar/interface-setup.el | 2 |
5 files changed, 7 insertions, 11 deletions
diff --git a/generic/proof-site.el b/generic/proof-site.el index e74d92ee..24ed03e6 100644 --- a/generic/proof-site.el +++ b/generic/proof-site.el @@ -35,8 +35,8 @@ ;; Master table of supported assistants. May not enable both kinds of ;; Isabelle interfaces at the same time! (defcustom proof-assistant-table - '((isa "Isabelle" "\\.ML$\\|\\.thy$") - ;(isar "Isabelle/Isar" "\\.thy$") + '((isar "Isabelle/Isar" "\\.thy$") + (isa "Isabelle" "\\.ML$\\|\\.thy$") (lego "LEGO" "\\.l$") (coq "Coq" "\\.v$") (plastic "Plastic" "\\.lf$") diff --git a/isa/interface b/isa/interface index 30d150c3..85df81c1 100644 --- a/isa/interface +++ b/isa/interface @@ -2,7 +2,7 @@ # # $Id$ # -# Proof General interface wrapper for Isabelle/classic. +# Proof General interface wrapper for classic Isabelle. ## diagnostics @@ -37,7 +37,7 @@ function fail() ## process command line -PROOFGENERAL_HOME=$(cd $(dirname "$0"); cd ..; echo $PWD) +export PROOFGENERAL_HOME=$(cd $(dirname "$0"); cd ..; echo $PWD) # options @@ -108,6 +108,6 @@ do [ -f "$FILE" ] && ARGS="$ARGS -l $FILE" done -export PROOFGENERAL_HOME +export PROOFGENERAL_ASSISTANTS=isa export PROOFGENERAL_LOGIC="$LOGIC" exec $PROGNAME $ARGS $FILES diff --git a/isa/interface-setup.el b/isa/interface-setup.el index a394121c..fce64173 100644 --- a/isa/interface-setup.el +++ b/isa/interface-setup.el @@ -5,5 +5,3 @@ (customize-set-variable 'isabelle-prog-name (concat (getenv "ISABELLE") " " (getenv "PROOFGENERAL_LOGIC"))) - -(customize-set-variable 'proof-assistant-table '((isa "Isabelle" "\\.ML$\\|\\.thy$"))) diff --git a/isar/interface b/isar/interface index 0a25e934..a62df5ca 100644 --- a/isar/interface +++ b/isar/interface @@ -37,7 +37,7 @@ function fail() ## process command line -PROOFGENERAL_HOME=$(cd $(dirname "$0"); cd ..; echo $PWD) +export PROOFGENERAL_HOME=$(cd $(dirname "$0"); cd ..; echo $PWD) # options @@ -108,6 +108,6 @@ do [ -f "$FILE" ] && ARGS="$ARGS -l $FILE" done -export PROOFGENERAL_HOME +export PROOFGENERAL_ASSISTANTS=isar export PROOFGENERAL_LOGIC="$LOGIC" exec $PROGNAME $ARGS $FILES diff --git a/isar/interface-setup.el b/isar/interface-setup.el index 06a383d1..3cf70b39 100644 --- a/isar/interface-setup.el +++ b/isar/interface-setup.el @@ -5,5 +5,3 @@ (customize-set-variable 'isabelle-isar-prog-name (concat (getenv "ISABELLE") " " (getenv "PROOFGENERAL_LOGIC"))) - -(customize-set-variable 'proof-assistant-table '((isar "Isabelle/Isar" "\\.thy$"))) |