From bf4b5879b4fdfee1eb0a38d54a4feb909502f2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Thu, 21 Jan 2010 14:51:37 +0100
Subject: [PATCH] Fixed Join Lines action when dealing with wrapped lines
---
src/plugins/texteditor/basetexteditor.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 7c1b7242343..6a7b725e592 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -882,17 +882,17 @@ void BaseTextEditor::joinLines()
QTextCursor move = textCursor();
move.beginEditBlock();
- move.movePosition(QTextCursor::Down);
+ move.movePosition(QTextCursor::NextBlock);
move.movePosition(QTextCursor::StartOfBlock);
move.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
QString cutLine = move.selectedText();
- // collapse trailing whitespaces to one or insert whitespace
+ // Collapse leading whitespaces to one or insert whitespace
cutLine.replace(QRegExp("^\\s*"), " ");
move.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor);
move.removeSelectedText();
- move.movePosition(QTextCursor::Up);
+ move.movePosition(QTextCursor::PreviousBlock);
move.movePosition(QTextCursor::EndOfBlock);
move.insertText(cutLine);
--
GitLab