diff -r 18fe288f6801 -r 561754277494 src/Pure/PIDE/markup_tree.scala
--- a/src/Pure/PIDE/markup_tree.scala	Fri Feb 21 00:18:40 2014 +0100
+++ b/src/Pure/PIDE/markup_tree.scala	Fri Feb 21 12:07:38 2014 +0100
@@ -80,6 +80,14 @@
   {
     def markup: List[XML.Elem] = rev_markup.reverse
 
+    def filter_markup(pred: String => Boolean): List[XML.Elem] =
+    {
+      var result: List[XML.Elem] = Nil
+      for { elem <- rev_markup; if (pred(elem.name)) }
+        result ::= elem
+      result.toList
+    }
+
     def + (markup: Text.Markup): Entry =
       copy(rev_markup = markup.info :: rev_markup, elements = elements + markup.info)
 
@@ -230,8 +238,7 @@
       var y = x
       var changed = false
       for {
-        elem <- entry.markup
-        if elements(elem.name)
+        elem <- entry.filter_markup(elements)
         y1 <- result(y, Text.Info(entry.range, elem))
       } { y = y1; changed = true }
       if (changed) Some(y) else None