Fix merge conflicts

2019-11-20 18:56:18 +01:00
parent dd96432c6e bd301bd5cc
commit c0828c7f1d
17 changed files with 197 additions and 85 deletions
@@ -608,7 +608,7 @@ class GuiMainMenu(QMenuBar):
        self.aReRunSpell = QAction("Re-Run Spell Check", self)
        self.aReRunSpell.setStatusTip("Run the spell checker on current document")
        self.aReRunSpell.setShortcut("F7")
-        self.aReRunSpell.triggered.connect(self.theParent.docEditor.updateSpellCheck)
+        self.aReRunSpell.triggered.connect(self.theParent.docEditor.reHighlightDocument)
        self.toolsMenu.addAction(self.aReRunSpell)

        # Tools > Separator