diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp
index 83ea0838509..0674dcb9587 100644
--- a/mozilla/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/htmlparser/src/CNavDTD.cpp
@@ -725,7 +725,7 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsI
  
   static eHTMLTags gBodyBlockers[]={eHTMLTag_body,eHTMLTag_frameset,eHTMLTag_head,eHTMLTag_map};
   PRInt32 theBodyBlocker=GetTopmostIndexOf(gBodyBlockers,sizeof(gBodyBlockers)/sizeof(eHTMLTag_unknown));
-  if(!theBodyBlocker) {
+  if(kNotFound==theBodyBlocker) {
     if(CanPropagate(eHTMLTag_body,aChildTag)) {
       mHasOpenBody=PR_TRUE;
       CStartToken theToken(eHTMLTag_body);  //open the body container...
@@ -1269,7 +1269,7 @@ PRBool CNavDTD::CanPropagate(eHTMLTags aParentTag,eHTMLTags aChildTag) const {
     }//if
   }//if
   else if(nsHTMLElement::IsTextTag(aChildTag)){
-
+    result=PR_TRUE;
   }
   return result;
 }
diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp
index 9136ca3d03c..cce803275cf 100644
--- a/mozilla/htmlparser/src/nsParser.cpp
+++ b/mozilla/htmlparser/src/nsParser.cpp
@@ -21,7 +21,7 @@
 #include "nsParser.h"
 #include "nsIContentSink.h" 
 #include "nsString.h"
-#include "nsCRT.h"
+#include "nsCRT.h" 
 #include "nsScanner.h"
 #include "prenv.h"  //this is here for debug reasons...
 #include "plstr.h"
@@ -32,7 +32,7 @@
 #include "nsWellFormedDTD.h"
 #include "nsViewSourceHTML.h" //uncomment this to partially enable viewsource...
 
-#define rickgdebug
+#undef rickgdebug
 #ifdef  rickgdebug
 #include "CRtfDTD.h"
 #endif
@@ -863,7 +863,7 @@ nsresult nsParser::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRUin
     theStartPos+=theNumRead;
   }//while
 
-  return ResumeParse();
+  return ResumeParse(); 
 }
 
 /**
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index 83ea0838509..0674dcb9587 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -725,7 +725,7 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsI
  
   static eHTMLTags gBodyBlockers[]={eHTMLTag_body,eHTMLTag_frameset,eHTMLTag_head,eHTMLTag_map};
   PRInt32 theBodyBlocker=GetTopmostIndexOf(gBodyBlockers,sizeof(gBodyBlockers)/sizeof(eHTMLTag_unknown));
-  if(!theBodyBlocker) {
+  if(kNotFound==theBodyBlocker) {
     if(CanPropagate(eHTMLTag_body,aChildTag)) {
       mHasOpenBody=PR_TRUE;
       CStartToken theToken(eHTMLTag_body);  //open the body container...
@@ -1269,7 +1269,7 @@ PRBool CNavDTD::CanPropagate(eHTMLTags aParentTag,eHTMLTags aChildTag) const {
     }//if
   }//if
   else if(nsHTMLElement::IsTextTag(aChildTag)){
-
+    result=PR_TRUE;
   }
   return result;
 }
diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp
index 9136ca3d03c..cce803275cf 100644
--- a/mozilla/parser/htmlparser/src/nsParser.cpp
+++ b/mozilla/parser/htmlparser/src/nsParser.cpp
@@ -21,7 +21,7 @@
 #include "nsParser.h"
 #include "nsIContentSink.h" 
 #include "nsString.h"
-#include "nsCRT.h"
+#include "nsCRT.h" 
 #include "nsScanner.h"
 #include "prenv.h"  //this is here for debug reasons...
 #include "plstr.h"
@@ -32,7 +32,7 @@
 #include "nsWellFormedDTD.h"
 #include "nsViewSourceHTML.h" //uncomment this to partially enable viewsource...
 
-#define rickgdebug
+#undef rickgdebug
 #ifdef  rickgdebug
 #include "CRtfDTD.h"
 #endif
@@ -863,7 +863,7 @@ nsresult nsParser::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRUin
     theStartPos+=theNumRead;
   }//while
 
-  return ResumeParse();
+  return ResumeParse(); 
 }
 
 /**