[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit d4878751924d96b0ca91c19a3dfdbef91696bf36
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 27 21:01:34 2002 +0000

    	- fixed 2973342 -- copied text seems to have an extra blank line between paragraphs
    
            * khtml/khtml_part.cpp: (KHTMLPart::selectedText):
    	Get rid of code that was adding an extraneous newline at the
    	ends of various types of nodes, including <P>.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1461 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f537cce..d13843f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-06-27  Darin Adler  <darin at apple.com>
 
+	- fixed 2973342 -- copied text seems to have an extra blank line between paragraphs
+
+        * khtml/khtml_part.cpp: (KHTMLPart::selectedText):
+	Get rid of code that was adding an extraneous newline at the
+	ends of various types of nodes, including <P>
+
+2002-06-27  Darin Adler  <darin at apple.com>
+
 	Fix Java. My changes this morning broke it.
 
         * khtml/rendering/render_applet.cpp: (RenderApplet::processArguments):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f537cce..d13843f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-06-27  Darin Adler  <darin at apple.com>
 
+	- fixed 2973342 -- copied text seems to have an extra blank line between paragraphs
+
+        * khtml/khtml_part.cpp: (KHTMLPart::selectedText):
+	Get rid of code that was adding an extraneous newline at the
+	ends of various types of nodes, including <P>
+
+2002-06-27  Darin Adler  <darin at apple.com>
+
 	Fix Java. My changes this morning broke it.
 
         * khtml/rendering/render_applet.cpp: (RenderApplet::processArguments):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f537cce..d13843f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-06-27  Darin Adler  <darin at apple.com>
 
+	- fixed 2973342 -- copied text seems to have an extra blank line between paragraphs
+
+        * khtml/khtml_part.cpp: (KHTMLPart::selectedText):
+	Get rid of code that was adding an extraneous newline at the
+	ends of various types of nodes, including <P>
+
+2002-06-27  Darin Adler  <darin at apple.com>
+
 	Fix Java. My changes this morning broke it.
 
         * khtml/rendering/render_applet.cpp: (RenderApplet::processArguments):
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index b87ac76..b62b240 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2066,7 +2066,11 @@ QString KHTMLPart::selectedText() const
           case ID_H6:
             if (!hasNewLine)
                text += "\n";
+#ifdef APPLE_CHANGES
+            // The extra newline is needed at the start, not the end, of these types of tags.
+#else
             text += "\n";
+#endif
             hasNewLine = true;
             break;
         }

-- 
WebKit Debian packaging