1.1 --- a/etc/settings	Sat Dec 05 14:26:56 2015 +0100
     1.2 +++ b/etc/settings	Sat Dec 05 16:09:41 2015 +0100
     1.3 @@ -14,11 +14,15 @@
     1.4  
     1.5  ISABELLE_SCALA_BUILD_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.7 -Xmax-classfile-name 130"
     1.6  
     1.7 -ISABELLE_JAVA_SYSTEM_OPTIONS="-Dfile.encoding=UTF-8 -server"
     1.8 +ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0"
     1.9  
    1.10  classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
    1.11  
    1.12 -#paranoia setting -- avoid problems of Java/Swing versus XIM/IBus etc.
    1.13 +#paranoia settings -- avoid intrusion of alien options
    1.14 +unset "_JAVA_OPTIONS"
    1.15 +unset "JAVA_TOOL_OPTIONS"
    1.16 +
    1.17 +#paranoia settings -- avoid problems of Java/Swing versus XIM/IBus etc.
    1.18  unset XMODIFIERS
    1.19  
    1.20  
    1.21 @@ -34,7 +38,7 @@
    1.22  ###
    1.23  
    1.24  ISABELLE_BUILD_OPTIONS=""
    1.25 -ISABELLE_BUILD_JAVA_OPTIONS="-Xmx1024m -Xss1m"
    1.26 +ISABELLE_BUILD_JAVA_OPTIONS="-Djava.awt.headless=true -Xmx1024m -Xss1m"
    1.27  
    1.28  
    1.29  ###
    1.30 @@ -56,16 +60,16 @@
    1.31  
    1.32  # The place for user configuration, heap files, etc.
    1.33  if [ -z "$ISABELLE_IDENTIFIER" ]; then
    1.34 -  ISABELLE_HOME_USER="$USER_HOME/.isabelle"
    1.35 +  ISABELLE_HOME_USER="$USER_HOME/.isabelle/isabisac"
    1.36  else
    1.37 -  ISABELLE_HOME_USER="$USER_HOME/.isabelle/isabisac" 
    1.38 +  ISABELLE_HOME_USER="$USER_HOME/.isabelle/isabisac"
    1.39  fi
    1.40  
    1.41  # Where to look for isabelle tools (multiple dirs separated by ':').
    1.42  ISABELLE_TOOLS="$ISABELLE_HOME/lib/Tools"
    1.43  
    1.44  # Location for temporary files (should be on a local file system).
    1.45 -ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
    1.46 +ISABELLE_TMP_PREFIX="${TMPDIR:-/tmp}/isabelle-$USER"
    1.47  
    1.48  # Heap input locations. ML system identifier is included in lookup.
    1.49  ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps"