From 16518d2f5d33f5572c7c372c4300fcbee444c402 Mon Sep 17 00:00:00 2001
From: "ftang%netscape.com"
 <ftang%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 25 Aug 2000 07:48:50 +0000
Subject: [PATCH] fix 50072. move the order of kCharsetFromAutoDetect higher
 than kCharsetFromCache and kCharsetFromBookmark

git-svn-id: svn://10.0.0.236/trunk@77194 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/htmlparser/src/nsIParser.h        | 2 +-
 mozilla/parser/htmlparser/src/nsIParser.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/htmlparser/src/nsIParser.h b/mozilla/htmlparser/src/nsIParser.h
index c232bd4d230..9f2ede2b47e 100644
--- a/mozilla/htmlparser/src/nsIParser.h
+++ b/mozilla/htmlparser/src/nsIParser.h
@@ -88,9 +88,9 @@ typedef enum {
    kCharsetFromUserDefault ,
    kCharsetFromDocTypeDefault,
    kCharsetFromParentFrame,
-   kCharsetFromAutoDetection,
    kCharsetFromCache,
    kCharsetFromBookmarks,
+   kCharsetFromAutoDetection,
    kCharsetFromMetaTag,
    kCharsetFromByteOrderMark,
    kCharsetFromHTTPHeader,
diff --git a/mozilla/parser/htmlparser/src/nsIParser.h b/mozilla/parser/htmlparser/src/nsIParser.h
index c232bd4d230..9f2ede2b47e 100644
--- a/mozilla/parser/htmlparser/src/nsIParser.h
+++ b/mozilla/parser/htmlparser/src/nsIParser.h
@@ -88,9 +88,9 @@ typedef enum {
    kCharsetFromUserDefault ,
    kCharsetFromDocTypeDefault,
    kCharsetFromParentFrame,
-   kCharsetFromAutoDetection,
    kCharsetFromCache,
    kCharsetFromBookmarks,
+   kCharsetFromAutoDetection,
    kCharsetFromMetaTag,
    kCharsetFromByteOrderMark,
    kCharsetFromHTTPHeader,