# HG changeset patch
# User wenzelm
# Date 1472841054 -7200
# Node ID fd6caec306fc5fad1915cb9a1026ff1592adb2f7
# Parent  81e4d4f42f6586a4df5e7ce26c3a8c0e96c40fa0# Parent  749794930d618f6edc46126d83a79283216c84aa
merged

diff -r 81e4d4f42f65 -r fd6caec306fc src/Pure/library.scala
--- a/src/Pure/library.scala	Fri Sep 02 16:10:23 2016 +0200
+++ b/src/Pure/library.scala	Fri Sep 02 20:30:54 2016 +0200
@@ -188,10 +188,10 @@
   def remove[A, B](x: B)(xs: List[A]): List[A] = if (member(xs)(x)) xs.filterNot(_ == x) else xs
   def update[A](x: A)(xs: List[A]): List[A] = x :: remove(x)(xs)
 
-  def distinct[A](xs: List[A], eq: (A, A) => Boolean = (x: A, y: A) => x == y): List[A] =
+  def distinct[A](xs: List[A]): List[A] =
   {
     val result = new mutable.ListBuffer[A]
-    for (x <- xs if !result.exists(y => eq(x, y))) result += x
+    xs.foreach(x => if (!result.contains(x)) result += x)
     result.toList
   }
 }
diff -r 81e4d4f42f65 -r fd6caec306fc src/Tools/jEdit/src/keymap_merge.scala
--- a/src/Tools/jEdit/src/keymap_merge.scala	Fri Sep 02 16:10:23 2016 +0200
+++ b/src/Tools/jEdit/src/keymap_merge.scala	Fri Sep 02 20:30:54 2016 +0200
@@ -53,12 +53,9 @@
     def is_ignored(keymap_name: String): Boolean =
       ignored_keymaps().contains(keymap_name)
 
-    def ignore(keymap_name: String)
-    {
-      val keymaps1 = Library.insert(keymap_name)(ignored_keymaps()).sorted
-      if (keymaps1.isEmpty) jEdit.resetProperty(prop_ignore)
-      else jEdit.setProperty(prop_ignore, keymaps1.mkString(","))
-    }
+    def ignore(keymap_name: String): Unit =
+      jEdit.setProperty(prop_ignore,
+        Library.insert(keymap_name)(ignored_keymaps()).sorted.mkString(","))
 
     def set(keymap: Keymap): Unit = keymap.setShortcut(property, binding)
     def reset(keymap: Keymap): Unit = keymap.setShortcut(property, null)
diff -r 81e4d4f42f65 -r fd6caec306fc src/Tools/jEdit/src/text_overview.scala
--- a/src/Tools/jEdit/src/text_overview.scala	Fri Sep 02 16:10:23 2016 +0200
+++ b/src/Tools/jEdit/src/text_overview.scala	Fri Sep 02 20:30:54 2016 +0200
@@ -86,6 +86,7 @@
         val overview = get_overview()
 
         if (rendering.snapshot.is_outdated || overview != current_overview) {
+          invoke()
           delay_repaint.invoke()
 
           gfx.setColor(rendering.outdated_color)