Mercurial Mercurial > repos > isabelle / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clarified;
authorwenzelm
Thu, 01 Sep 2016 11:25:48 +0200
changeset 63742 1e676fcd7ede
parent 63741 10c08a4d39dd
child 63743 beebcfc745d3
clarified;
src/Tools/jEdit/src/keymap_merge.scala file | annotate | diff | comparison | revisions 
--- a/src/Tools/jEdit/src/keymap_merge.scala	Thu Sep 01 11:21:27 2016 +0200
+++ b/src/Tools/jEdit/src/keymap_merge.scala	Thu Sep 01 11:25:48 2016 +0200
@@ -113,7 +113,7 @@
       val conflicts =
         keymap_shortcuts.filter(s1 =>
           s.property == s1.property && s.binding != s1.binding ||
-          s.property != s1.property && s.binding == s1.binding)
+          s.property != s1.property && s.binding == s1.binding && s1.binding != "")
       (s, conflicts)
     }
   }
isabelle