# HG changeset patch
# User wenzelm
# Date 1441712437 -7200
# Node ID 70029aae9a9f4a55177f7ee90bfc24d9d91ecfae
# Parent  83459eb76fe34b85900321622d51ae00bde4ab5e
clarified JEDIT_JAVA_SYSTEM_OPTIONS;

diff -r 83459eb76fe3 -r 70029aae9a9f Admin/lib/Tools/makedist_bundle
--- a/Admin/lib/Tools/makedist_bundle	Tue Sep 08 11:44:15 2015 +0200
+++ b/Admin/lib/Tools/makedist_bundle	Tue Sep 08 13:40:37 2015 +0200
@@ -198,7 +198,7 @@
     done
     cat "$ISABELLE_HOME/Admin/Linux/Isabelle.run" | \
       perl -p > "$ISABELLE_TARGET/${ISABELLE_NAME}.run" \
-        -e "s,{JAVA_ARGS},$JEDIT_JAVA_OPTIONS $JEDIT_SYSTEM_OPTIONS,g; s,{CLASSPATH},$LINUX_CLASSPATH,;"
+        -e "s,{JAVA_ARGS},$JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS,g; s,{CLASSPATH},$LINUX_CLASSPATH,;"
     chmod +x "$ISABELLE_TARGET/${ISABELLE_NAME}.run"
 
     mv "$ISABELLE_TARGET/contrib/linux_app" "$TMP/."
@@ -242,7 +242,7 @@
     (
       echo -e "# Java runtime options\r"
       declare -a JAVA_ARGS=()
-      eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS $JEDIT_SYSTEM_OPTIONS)"
+      eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
       for ARG in "${JAVA_ARGS[@]}"
       do
         echo -e "$ARG\r"
@@ -335,7 +335,7 @@
           cat "$APP_TEMPLATE/Info.plist-part1"
 
           declare -a OPTIONS=()
-          eval "OPTIONS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS $JEDIT_SYSTEM_OPTIONS)"
+          eval "OPTIONS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
           for OPT in "${OPTIONS[@]}"
           do
             echo "<string>$OPT</string>"
diff -r 83459eb76fe3 -r 70029aae9a9f src/Doc/JEdit/JEdit.thy
--- a/src/Doc/JEdit/JEdit.thy	Tue Sep 08 11:44:15 2015 +0200
+++ b/src/Doc/JEdit/JEdit.thy	Tue Sep 08 13:40:37 2015 +0200
@@ -226,12 +226,12 @@
   Usage: isabelle jedit [OPTIONS] [FILES ...]
 
   Options are:
-    -J OPTION    add JVM runtime option (default JEDIT_JAVA_OPTIONS)
+    -J OPTION    add JVM runtime option
     -b           build only
     -d DIR       include session directory
     -f           fresh build
-    -j OPTION    add jEdit runtime option (default JEDIT_OPTIONS)
-    -l NAME      logic image name (default ISABELLE_LOGIC)
+    -j OPTION    add jEdit runtime option
+    -l NAME      logic image name
     -m MODE      add print mode for output
     -n           no build of session image on startup
     -s           system build mode for session image
diff -r 83459eb76fe3 -r 70029aae9a9f src/Tools/jEdit/etc/settings
--- a/src/Tools/jEdit/etc/settings	Tue Sep 08 11:44:15 2015 +0200
+++ b/src/Tools/jEdit/etc/settings	Tue Sep 08 13:40:37 2015 +0200
@@ -7,7 +7,7 @@
 #JEDIT_JAVA_OPTIONS="-Xms128m -Xmx512m -Xss1m"
 JEDIT_JAVA_OPTIONS="-Xms128m -Xmx1024m -Xss4m"
 #JEDIT_JAVA_OPTIONS="-Xms512m -Xmx4096m -Xss8m"
-JEDIT_SYSTEM_OPTIONS="-Duser.language=en -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.application.name=Isabelle"
+JEDIT_JAVA_SYSTEM_OPTIONS="-Duser.language=en -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.application.name=Isabelle"
 
 ISABELLE_JEDIT_OPTIONS=""
 
diff -r 83459eb76fe3 -r 70029aae9a9f src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Tue Sep 08 11:44:15 2015 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Tue Sep 08 13:40:37 2015 +0200
@@ -81,8 +81,9 @@
   echo "Usage: isabelle $PRG [OPTIONS] [FILES ...]"
   echo
   echo "  Options are:"
-  echo "    -J OPTION    add JVM runtime option"
-  echo "                 (default JEDIT_JAVA_OPTIONS=$JEDIT_JAVA_OPTIONS)"
+  echo "    -J OPTION    add JVM runtime option (defaults"
+  echo "                   JEDIT_JAVA_SYSTEM_OPTIONS=$JEDIT_JAVA_SYSTEM_OPTIONS"
+  echo "                   JEDIT_JAVA_OPTIONS=$JEDIT_JAVA_OPTIONS)"
   echo "    -b           build only"
   echo "    -d DIR       include session directory"
   echo "    -f           fresh build"
@@ -170,7 +171,7 @@
   done
 }
 
-declare -a JAVA_ARGS; eval "JAVA_ARGS=($JEDIT_JAVA_OPTIONS $JEDIT_SYSTEM_OPTIONS)"
+declare -a JAVA_ARGS; eval "JAVA_ARGS=($JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
 
 declare -a ARGS=()