Reviewed by Hyatt

        Fix for this bug:

        <rdar://problem/3943648> extra line is inserted after pressing return within quoted text of reply

        * khtml/editing/htmlediting.cpp:
        (khtml::InsertParagraphSeparatorInQuotedContentCommand::doApply): This bug was the result of a
        simple coding mistake. A local variable was erroneously redefined in a deeper scope, and so the
        result calculated in that deeper scope was not available when tested.

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 50baa1b69e1be47ff6984c80b2c1a5229bb02621..67cafddb000156200892024d619ce0fc2ff4c72d 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2005-01-10  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by Hyatt
+
+        Fix for this bug:
+        
+        <rdar://problem/3943648> extra line is inserted after pressing return within quoted text of reply
+
+        * khtml/editing/htmlediting.cpp:
+        (khtml::InsertParagraphSeparatorInQuotedContentCommand::doApply): This bug was the result of a 
+        simple coding mistake. A local variable was erroneously redefined in a deeper scope, and so the 
+        result calculated in that deeper scope was not available when tested.
+
 2005-01-10  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John

diff --git a/WebCore/khtml/editing/htmlediting.cpp b/WebCore/khtml/editing/htmlediting.cpp
index 93571c201037b25cae25dc8c5b3f5b75ff043c4a..2b448731365d548b449294bce5130723bbf48390 100644 (file)
--- a/WebCore/khtml/editing/htmlediting.cpp
+++ b/WebCore/khtml/editing/htmlediting.cpp
@@ -2645,7 +2645,7 @@ void InsertParagraphSeparatorInQuotedContentCommand::doApply()
         bool startIsBR = false;
         if (startNode != topBlockquote) {
             NodeImpl *n = startNode;
-            bool startIsBR = n->id() == ID_BR;
+            startIsBR = n->id() == ID_BR;
             if (startIsBR)
                 n = n->nextSibling();
             while (n) {