--- a/src/Tools/jEdit/src/jedit_sessions.scala Fri Apr 07 11:50:49 2017 +0200
+++ b/src/Tools/jEdit/src/jedit_sessions.scala Fri Apr 07 11:53:44 2017 +0200
@@ -38,10 +38,10 @@
options.string(option_name))
(for {
- tree <-
+ sessions <-
try { Some(Sessions.load(session_options(options), dirs = session_dirs())) }
catch { case ERROR(_) => None }
- info <- tree.get(logic)
+ info <- sessions.get(logic)
parent <- info.parent
if Isabelle_System.getenv("JEDIT_LOGIC_ROOT") == "true"
} yield Info(parent, info.pos)) getOrElse Info(logic, Position.none)
@@ -75,9 +75,9 @@
def session_list(options: Options): List[String] =
{
- val session_tree = Sessions.load(options, dirs = session_dirs())
+ val sessions = Sessions.load(options, dirs = session_dirs())
val (main_sessions, other_sessions) =
- session_tree.imports_topological_order.partition(p => p._2.groups.contains("main"))
+ sessions.imports_topological_order.partition(p => p._2.groups.contains("main"))
main_sessions.map(_._1).sorted ::: other_sessions.map(_._1).sorted
}