driver.cs: Use Encoding.Default as default code page instead of ISO-28591.

svn path=/trunk/mcs/; revision=52302

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 5e949632db063f97b8cbe45637843b5ac25a9c57..0bccd33e0294d5932918c496bf2c5e902b677ce6 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-28  Kornél Pál  <kornelpal@hotmail.com>
+
+       * driver.cs: Use Encoding.Default as default code page instead
+         of ISO-28591.
+
 2005-10-27  Raja R Harinath  <rharinath@novell.com>
 
        Fix #76085.

diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
index a0a1d08ade27fff9e254dd0de24ae8b8bee9da85..b55786c60f487a30d997190a67757543b02fd29a 100644 (file)
--- a/mcs/mcs/driver.cs
+++ b/mcs/mcs/driver.cs
@@ -98,7 +98,6 @@ namespace Mono.CSharp
                //
                // Encoding.
                //
-               static Encoding default_encoding;
                static Encoding encoding;
 
 
@@ -114,7 +113,7 @@ namespace Mono.CSharp
                        win32ResourceFile = win32IconFile = null;
                        defines = null;
                        output_file = null;
-                       encoding = default_encoding = null;
+                       encoding = null;
                        first_source = null;
                }
 
@@ -1344,7 +1343,7 @@ namespace Mono.CSharp
                                        encoding = new UTF8Encoding();
                                        break;
                                case "reset":
-                                       encoding = default_encoding;
+                                       encoding = Encoding.Default;
                                        break;
                                default:
                                        try {
@@ -1443,14 +1442,7 @@ namespace Mono.CSharp
                        int i;
                        bool parsing_options = true;
 
-                       try {
-                               // Latin1
-                               default_encoding = Encoding.GetEncoding (28591);
-                       } catch (Exception) {
-                               // iso-8859-1
-                               default_encoding = Encoding.GetEncoding (1252);
-                       }
-                       encoding = default_encoding;
+                       encoding = Encoding.Default;
 
                        references = new ArrayList ();
                        external_aliases = new Hashtable ();