# HG changeset patch
# User wenzelm
# Date 852624112 -3600
# Node ID 9990f088d7acdd3847225bfe7eb8f3a2e9c8d4d6
# Parent  3eb12c85846c8e7b6b289f8352f7753c65b8a914
minor tuning;

diff -r 3eb12c85846c -r 9990f088d7ac lib/scripts/isa-emacs
--- a/lib/scripts/isa-emacs	Tue Jan 07 09:01:18 1997 +0100
+++ b/lib/scripts/isa-emacs	Tue Jan 07 09:01:52 1997 +0100
@@ -18,4 +18,15 @@
 
 ## main
 
-exec emacs -name "isabelle" $ISABELLE_INTERFACE_OPTIONS -l "$ISAMODE_HOME/elisp/isa-site.el" -l "$ISABELLE_HOME_USER/etc/isa-settings.el" -l "$ISAMODE_HOME/elisp/isa-start.el"
+if [ -f "$ISABELLE_HOME_USER/etc/isa-settings.el" ]; then
+  USER_SETTINGS="--load $ISABELLE_HOME_USER/etc/isa-settings.el"
+else
+  USER_SETTINGS=""
+fi
+
+exec emacs -name "isabelle" \
+  --no-init-file $ISABELLE_INTERFACE_OPTIONS \
+  --load "$ISAMODE_HOME/elisp/isa-site.el" \
+  $USER_SETTINGS \
+  --load $HOME/.emacs \
+  --funcall isabelle
diff -r 3eb12c85846c -r 9990f088d7ac lib/scripts/isa-xterm
--- a/lib/scripts/isa-xterm	Tue Jan 07 09:01:18 1997 +0100
+++ b/lib/scripts/isa-xterm	Tue Jan 07 09:01:52 1997 +0100
@@ -18,9 +18,9 @@
 
 if [ -z "$ISABELLE_SYMBOLS" -o "$ISABELLE_SYMBOLS" = false ]; then
   exec xterm -T Isabelle -n Isabelle $ISABELLE_INTERFACE_OPTIONS \
-    -e $ISABELLE_HOME/bin/isabelle "$@"
+    -e $ISABELLE "$@"
 else
-  $ISABELLE_HOME/bin/isatool installfonts
+  $ISATOOL installfonts
   exec xterm -T Isabelle -n Isabelle $ISABELLE_INTERFACE_OPTIONS -fn isacr14 \
     -xrm "*fontMenu.Label: Isabelle fonts" \
     -xrm "*fontMenu*font1*Label: Large" \
@@ -35,5 +35,5 @@
     -xrm "*VT100*font5:" \
     -xrm "*fontMenu*font6*Label:" \
     -xrm "*VT100*font6:" \
-    -e $ISABELLE_HOME/bin/isabelle -e 'print_mode:=["symbols"];' "$@"
+    -e $ISABELLE -e 'print_mode:=["symbols"];' "$@"
 fi
diff -r 3eb12c85846c -r 9990f088d7ac src/Pure/mk
--- a/src/Pure/mk	Tue Jan 07 09:01:18 1997 +0100
+++ b/src/Pure/mk	Tue Jan 07 09:01:52 1997 +0100
@@ -26,7 +26,7 @@
 [ -f "ML-Systems/$ML_SYSTEM.ML" ] && COMPAT="ML-Systems/$ML_SYSTEM.ML"
 [ -z "$COMPAT" ] && fail "Missing compatibility file for ML system \"$ML_SYSTEM\"!"
 
-$ISABELLE_HOME/bin/isabelle \
+$ISABELLE \
   -e "val ml_system = \"$ML_SYSTEM\";" \
   -e "use\"$COMPAT\"; use\"ROOT.ML\" handle _ => exit 1;" \
   -cq SYSTEM Pure