1.1 --- a/etc/settings	Wed Aug 30 21:48:01 2000 +0200
     1.2 +++ b/etc/settings	Thu Aug 31 00:11:40 2000 +0200
     1.3 @@ -8,18 +8,23 @@
     1.4  ### ML compiler settings (ESSENTIAL!)
     1.5  ###
     1.6  
     1.7 -## Uncomment and adapt one of the sections below.
     1.8 -
     1.9  # Note that ML_HOME specifies the location of the actual compiler
    1.10  # binaries.  Do not invent new ML system names unless you know what
    1.11 -# you are doing.
    1.12 +# you are doing.  Only one of the sections below should be activated.
    1.13  
    1.14 -# Poly/ML 3.x or later
    1.15 +# Poly/ML 3.x and 4.0
    1.16  POLYML_HOME=$(choosefrom \
    1.17 +  "$ISABELLE_HOME/contrib/polyml-4.0" \
    1.18 +  "$ISABELLE_HOME/contrib/polyml-3.x" \
    1.19    "$ISABELLE_HOME/contrib/polyml" \
    1.20 -  "$ISABELLE_HOME/../polyml")
    1.21 +  "$ISABELLE_HOME/../polyml-4.0" \
    1.22 +  "$ISABELLE_HOME/../polyml-3.x" \
    1.23 +  "$ISABELLE_HOME/../polyml" \
    1.24 +  "/usr/share/polyml-4.0" \
    1.25 +  "/usr/share/polyml-3.x" \
    1.26 +  "/usr/share/polyml")
    1.27 +ML_SYSTEM=$($POLYML_HOME/bin/polyml-version 2>/dev/null || echo polyml)
    1.28  ML_PLATFORM=$($POLYML_HOME/bin/polyml-platform 2>/dev/null)
    1.29 -ML_SYSTEM=$($POLYML_HOME/bin/polyml-version 2>/dev/null)
    1.30  ML_HOME=$POLYML_HOME/$ML_PLATFORM
    1.31  ML_OPTIONS="-h 30000"
    1.32  
    1.33 @@ -151,7 +156,7 @@
    1.34    "$ISABELLE_INTERFACE")
    1.35  PROOFGENERAL_OPTIONS=""
    1.36  
    1.37 -# X-Symbol mode
    1.38 +# X-Symbol mode for Proof General
    1.39  XSYMBOL_HOME=$(choosefrom \
    1.40    "$ISABELLE_HOME/contrib/x-symbol" \
    1.41    "$ISABELLE_HOME/../x-symbol" \