From fab90f1e90614a20cc2a023c3999de4dd8d64257 Mon Sep 17 00:00:00 2001 From: "jfrancis%netscape.com" Date: Wed, 16 Jun 1999 23:40:16 +0000 Subject: [PATCH] bug 8300; rvd: floppy moose; aprvd: chofmann git-svn-id: svn://10.0.0.236/trunk@35747 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsHTMLEditRules.cpp | 2 +- mozilla/editor/libeditor/html/nsHTMLEditRules.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp index 3d5ade20815..a3d40cfe56a 100644 --- a/mozilla/editor/base/nsHTMLEditRules.cpp +++ b/mozilla/editor/base/nsHTMLEditRules.cpp @@ -1687,7 +1687,7 @@ nsHTMLEditRules::ReturnInHeader(nsIDOMSelection *aSelection, // merge text node with like sibling, if any nsCOMPtr sibling; textNode->GetNextSibling(getter_AddRefs(sibling)); - if (sibling) + if (sibling && mEditor->IsTextNode(sibling) && mEditor->IsEditable(sibling)) { res = mEditor->JoinNodes(textNode,sibling,p); if (NS_FAILED(res)) return res; diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp index 3d5ade20815..a3d40cfe56a 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp @@ -1687,7 +1687,7 @@ nsHTMLEditRules::ReturnInHeader(nsIDOMSelection *aSelection, // merge text node with like sibling, if any nsCOMPtr sibling; textNode->GetNextSibling(getter_AddRefs(sibling)); - if (sibling) + if (sibling && mEditor->IsTextNode(sibling) && mEditor->IsEditable(sibling)) { res = mEditor->JoinNodes(textNode,sibling,p); if (NS_FAILED(res)) return res;