aboutsummaryrefslogtreecommitdiffhomepage
path: root/isar
diff options
context:
space:
mode:
authorGravatar Makarius Wenzel <makarius@sketis.net>2009-07-29 16:19:55 +0000
committerGravatar Makarius Wenzel <makarius@sketis.net>2009-07-29 16:19:55 +0000
commit61e29fa38387e10b73efc36040b06473386b9036 (patch)
treeb799105fcfd69f816d07ee1bb05546198cdf7491 /isar
parent6d278e30b43a1d060f21e9b39d8cfecebebb5d61 (diff)
ISABELLE_TOOL refers to "isabelle" tool wrapper;
ISABELLE_PROCESS refers to "isabelle-process";
Diffstat (limited to 'isar')
-rw-r--r--isar/interface2
-rw-r--r--isar/isabelle-system.el12
2 files changed, 7 insertions, 7 deletions
diff --git a/isar/interface b/isar/interface
index 9ca83f3b..b2ed3209 100644
--- a/isar/interface
+++ b/isar/interface
@@ -175,7 +175,7 @@ function installfonts ()
if [ "$START_PG" = false ]; then
[ "$ISAR" = true ] && ISABELLE_OPTIONS="$ISABELLE_OPTIONS -I"
- exec "$ISABELLE" $ISABELLE_OPTIONS "$LOGIC"
+ exec "$ISABELLE_PROCESS" $ISABELLE_OPTIONS "$LOGIC"
else
diff --git a/isar/isabelle-system.el b/isar/isabelle-system.el
index 2998bc33..e206822a 100644
--- a/isar/isabelle-system.el
+++ b/isar/isabelle-system.el
@@ -40,7 +40,7 @@
(or (if proof-rsh-command
;; not much hope to locate executable remotely
(concat proof-rsh-command " isabelle"))
- (getenv "ISABELLE")
+ (getenv "ISABELLE_TOOL")
(proof-locate-executable "isabelle" nil
(list
;; support default unpack in home dir situation
@@ -172,14 +172,14 @@ at the top of your theory file, like this:
"Make proper command line for running Isabelle.
This function sets `isabelle-prog-name' and `proof-prog-name'."
(let*
- ;; The ISABELLE and PROOFGENERAL_LOGIC values (set when run
- ;; under the interface wrapper script) indicate command line
+ ;; The ISABELLE_PROCESS and PROOFGENERAL_LOGIC values (set when
+ ;; run under the interface wrapper script) indicate command line
;; is set in current Isabelle settings environment.
((isabelle (or
isabelle-program-name-override ; override in Emacs
- (getenv "ISABELLE") ; command line override
- (isa-getenv "ISABELLE") ; choose to match isabelle
- "isabelle")) ; to
+ (getenv "ISABELLE_PROCESS") ; command line override
+ (isa-getenv "ISABELLE_PROCESS") ; choose to match isabelle
+ "isabelle-process")) ; to
(isabelle-opts (getenv "ISABELLE_OPTIONS"))
(opts (concat " -PI" ;; Proof General + Isar
(if proof-shell-unicode " -m PGASCII" "")