1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index 102a776ed3..cf584f6980 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -45,6 +45,7 @@
 #include <private/qtextdocument_p.h>
 #include <qtextlayout.h>
 #include <qpointer.h>
+#include <qscopedvaluerollback.h>
 #include <qtextobject.h>
 #include <qtextcursor.h>
 #include <qdebug.h>
@@ -68,14 +69,14 @@ public:
     void reformatBlocks(int from, int charsRemoved, int charsAdded);
     void reformatBlock(const QTextBlock &block);
 
-    inline void rehighlight(QTextCursor &cursor, QTextCursor::MoveOperation operation) {
-        inReformatBlocks = true;
+    inline void rehighlight(QTextCursor &cursor, QTextCursor::MoveOperation operation)
+    {
+        QScopedValueRollback<bool> bg(inReformatBlocks, true);
         cursor.beginEditBlock();
         int from = cursor.position();
         cursor.movePosition(operation);
         reformatBlocks(from, 0, cursor.position() - from);
         cursor.endEditBlock();
-        inReformatBlocks = false;
     }
 
     inline void _q_delayedRehighlight() {