src/Tools/jEdit/src/jedit/plugin.scala

--- a/src/Tools/jEdit/src/jedit/plugin.scala	Fri Dec 11 23:38:14 2009 +0100
+++ b/src/Tools/jEdit/src/jedit/plugin.scala	Tue Dec 15 00:21:21 2009 +0100
@@ -55,17 +55,20 @@
 
   /* settings */
 
-  def cmd_args(): List[String] =
+  def default_logic(): String =
+  {
+    val logic = system.getenv("JEDIT_LOGIC")
+    if (logic != "") logic
+    else system.getenv_strict("ISABELLE_LOGIC")
+  }
+
+  def isabelle_args(): List[String] =
   {
     val modes = system.getenv("JEDIT_PRINT_MODE").split(",").toList.map("-m" + _)
     val logic = {
-      val logic1 = Isabelle.Property("logic")
-      if (logic1 != null && logic1 != "" && logic1 != "default") logic1
-      else {
-        val logic2 = system.getenv("JEDIT_LOGIC")
-        if (logic2 != "") logic2
-        else system.getenv_strict("ISABELLE_LOGIC")
-      }
+      val logic = Isabelle.Property("logic")
+      if (logic != null && logic != "") logic
+      else default_logic()
     }
     modes ++ List(logic)
   }
@@ -94,7 +97,7 @@
     val theory_view = new Theory_View(Isabelle.session, text_area)   // FIXME multiple text areas!?
     mapping += (buffer -> theory_view)
 
-    Isabelle.session.start(Isabelle.cmd_args())
+    Isabelle.session.start(Isabelle.isabelle_args())
     theory_view.activate()
     Isabelle.session.begin_document(buffer.getName)
   }