From f486d19d62f1bc33246748b14b14a9dfa617b57f Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Thu, 19 Aug 2010 17:55:56 +0100 Subject: Merge WebKit at r65615 : Initial merge by git. Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79 --- WebCore/editing/DeleteSelectionCommand.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'WebCore/editing/DeleteSelectionCommand.cpp') diff --git a/WebCore/editing/DeleteSelectionCommand.cpp b/WebCore/editing/DeleteSelectionCommand.cpp index c37b0fc..5e025eb 100644 --- a/WebCore/editing/DeleteSelectionCommand.cpp +++ b/WebCore/editing/DeleteSelectionCommand.cpp @@ -630,7 +630,8 @@ void DeleteSelectionCommand::mergeParagraphs() // moveParagraphs will insert placeholders if it removes blocks that would require their use, don't let block // removals that it does cause the insertion of *another* placeholder. bool needPlaceholder = m_needPlaceholder; - moveParagraph(startOfParagraphToMove, endOfParagraphToMove, mergeDestination); + bool paragraphToMergeIsEmpty = (startOfParagraphToMove == endOfParagraphToMove); + moveParagraph(startOfParagraphToMove, endOfParagraphToMove, mergeDestination, false, !paragraphToMergeIsEmpty); m_needPlaceholder = needPlaceholder; // The endingPosition was likely clobbered by the move, so recompute it (moveParagraph selects the moved paragraph). m_endingPosition = endingSelection().start(); -- cgit v1.1