Reviewed by me

        * khtml/editing/htmlediting.cpp:
        (khtml::ReplacementFragment::mergeEndNode): Fixed one-line coding mistake that created an endless loop.
        Seemed simple enough to land without review.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8088 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a1d1ac70362efd89bc84645d9712345c89d54de0..91b8b4b21b325caea4dba25ac1c5c83d21c6f845 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2004-11-30  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by me
+
+        * khtml/editing/htmlediting.cpp:
+        (khtml::ReplacementFragment::mergeEndNode): Fixed one-line coding mistake that created an endless loop.
+        Seemed simple enough to land without review.
+
 2004-11-29  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by Chris

diff --git a/WebCore/khtml/editing/htmlediting.cpp b/WebCore/khtml/editing/htmlediting.cpp
index abe7879f51b45bdf27d2df3b04fa0f51b5a14836..6b4082e9b2b45e0ccff8bfdb676181f47fbe623c 100644 (file)
--- a/WebCore/khtml/editing/htmlediting.cpp
+++ b/WebCore/khtml/editing/htmlediting.cpp
@@ -2767,6 +2767,7 @@ NodeImpl *ReplacementFragment::mergeEndNode() const
                 if (!previousSibling || isProbablyBlock(previousSibling))
                     return node;
                 node = previousSibling;
+                previousSibling = node->previousSibling();
             }
         }
         node = prev;