Permalink
Browse files

#307 - crash when comparing files

  • Loading branch information...
vladdu committed Sep 3, 2017
1 parent 48f2e0a commit a64928a80248b6c455e4c93f4af1ef50cf938e47
Showing with 1 addition and 8 deletions.
  1. +1 −8 plugins/org.erlide.ui/src/org/erlide/ui/internal/compare/ErlMergeViewer.java
@@ -42,8 +42,6 @@
private ErlangSourceViewerConfiguration fSourceViewerConfiguration;
private IDocumentPartitioner documentPartitioner = null;
public ErlMergeViewer(final Composite parent, final int styles,
final CompareConfiguration mp) {
super(parent, styles, mp);
@@ -165,12 +163,7 @@ protected String getDocumentPartitioning() {
@Override
protected IDocumentPartitioner getDocumentPartitioner() {
if (documentPartitioner == null) {
documentPartitioner = ErlangDocumentSetupParticipant
.createDocumentPartitioner();
}
return documentPartitioner;
// return null;
return ErlangDocumentSetupParticipant.createDocumentPartitioner();
}
}

0 comments on commit a64928a

Please sign in to comment.