# HG changeset patch
# User wenzelm
# Date 1232143224 -3600
# Node ID c787cbe6cdce866a080677df267bb5ac3dff44ea
# Parent  095e5cae6656be980faff2468872862c8ac06ea4# Parent  e561d0915f28ae196788392c6ab5abd166547e9c
merged

diff -r 095e5cae6656 -r c787cbe6cdce src/Tools/jEdit/src/jedit/ScrollerDockable.scala
--- a/src/Tools/jEdit/src/jedit/ScrollerDockable.scala	Fri Jan 16 16:54:01 2009 +0100
+++ b/src/Tools/jEdit/src/jedit/ScrollerDockable.scala	Fri Jan 16 23:00:24 2009 +0100
@@ -228,7 +228,7 @@
         fontResolver.setFontMapping("Isabelle", Isabelle.plugin.font)
       panel.relayout()
     })
-    val tree = YXML.parse_failsafe(Isabelle.symbols.decode(r.result))
+    val tree = IsabelleProcess.parse_message(r.kind, Isabelle.symbols.decode(r.result))
     val document = XML.document(tree)
     panel.setDocument(document, UserAgent.baseURL)
     val sa = new SelectionActions
diff -r 095e5cae6656 -r c787cbe6cdce src/Tools/jEdit/src/prover/Command.scala
--- a/src/Tools/jEdit/src/prover/Command.scala	Fri Jan 16 16:54:01 2009 +0100
+++ b/src/Tools/jEdit/src/prover/Command.scala	Fri Jan 16 23:00:24 2009 +0100
@@ -13,7 +13,7 @@
 
 import isabelle.proofdocument.Token
 import isabelle.jedit.{Isabelle, Plugin}
-import isabelle.{YXML, XML}
+import isabelle.XML
 
 import sidekick.{SideKickParsedData, IAsset}
 
diff -r 095e5cae6656 -r c787cbe6cdce src/Tools/jEdit/src/prover/Prover.scala
--- a/src/Tools/jEdit/src/prover/Prover.scala	Fri Jan 16 16:54:01 2009 +0100
+++ b/src/Tools/jEdit/src/prover/Prover.scala	Fri Jan 16 23:00:24 2009 +0100
@@ -75,7 +75,7 @@
       }
     }
     else {
-      val tree = YXML.parse_failsafe(isabelle_symbols.decode(r.result))
+      val tree = IsabelleProcess.parse_message(r.kind, isabelle_symbols.decode(r.result))
       if (st == null || (st.status != Command.Status.REMOVED && st.status != Command.Status.REMOVE)) {
         r.kind match {