merge

--- a/src/Tools/jEdit/lib/Tools/jedit	Thu Sep 27 00:40:51 2012 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Thu Sep 27 00:41:08 2012 +0200
@@ -20,6 +20,7 @@
   "src/isabelle_rendering.scala"
   "src/isabelle_sidekick.scala"
   "src/jedit_lib.scala"
+  "src/jedit_main.scala"
   "src/jedit_thy_load.scala"
   "src/jedit_options.scala"
   "src/output_dockable.scala"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/jEdit/src/jedit_main.scala	Thu Sep 27 00:41:08 2012 +0200
@@ -0,0 +1,33 @@
+/*  Title:      Tools/jEdit/src/jedit_main.scala
+    Author:     Makarius
+
+Main entry point from running JVM.
+*/
+
+package isabelle.jedit
+
+
+import isabelle._
+
+
+import org.gjt.sp.jedit.jEdit
+
+
+object JEdit_Main
+{
+  def main(args: Array[String])
+  {
+    Platform.init_laf()
+    Isabelle_System.init()
+
+    System.setProperty("jedit.home",
+      Isabelle_System.platform_path(Path.explode("$JEDIT_HOME/dist")))
+
+    // FIXME properties from JEDIT_JAVA_OPTIONS JEDIT_SYSTEM_OPTIONS
+    val jedit_options = Isabelle_System.getenv_strict("JEDIT_OPTIONS").split(" +")
+    val jedit_settings =
+      Array("-settings=" + Isabelle_System.platform_path(Path.explode("$JEDIT_SETTINGS")))
+    jEdit.main(jedit_options ++ jedit_settings ++ args)
+  }
+}
+