From 7d06abb8e7d5197e59a9133ba766fa3052539e4f Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 5 Dec 2018 15:46:40 +0100
Subject: [PATCH] + chg: UTF-8 affine initial default settings

---
 src/Edit.c     | 2 +-
 src/Encoding.h | 2 ++
 src/Notepad3.c | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Edit.c b/src/Edit.c
index 629ebdf34..f99c51fe5 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -1013,7 +1013,7 @@ bool EditLoadFile(
   size_t const cbNbytes4Analysis = (cbData < 200000L) ? cbData : 200000L;
 
   int iPreferedEncoding = (bNfoDizDetected) ? g_DOSEncoding :
-    ((Settings.UseDefaultForFileEncoding || (cbNbytes4Analysis == 0)) ? Settings.DefaultEncoding : CPI_ANSI_DEFAULT);
+    ((Settings.UseDefaultForFileEncoding || (cbNbytes4Analysis == 0)) ? Settings.DefaultEncoding : PREFERRED_DEFAULT_ENCODING);
 
   // --------------------------------------------------------------------------
   bool bIsReliable = false;
diff --git a/src/Encoding.h b/src/Encoding.h
index 38e75c94a..824e8e2c1 100644
--- a/src/Encoding.h
+++ b/src/Encoding.h
@@ -56,6 +56,8 @@ extern bool g_bForceCompEncDetection;
 
 #define Encoding_IsNONE(enc) ((enc) == CPI_NONE)
 
+//~#define PREFERRED_DAFAULT_ENCODING  CPI_ANSI_DEFAULT
+#define PREFERRED_DEFAULT_ENCODING  CPI_UTF8
 
 typedef struct _np2encoding {
   UINT    uFlags;
diff --git a/src/Notepad3.c b/src/Notepad3.c
index c76659482..f9cfa2e5b 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -6840,15 +6840,15 @@ void LoadSettings()
     GET_BOOL_VALUE_FROM_INISECTION(ViewWhiteSpace, false);
     GET_BOOL_VALUE_FROM_INISECTION(ViewEOLs, false);
 
-    GET_INT_VALUE_FROM_INISECTION(DefaultEncoding, CPI_ANSI_DEFAULT, CED_NO_MAPPING, INT_MAX);
-    // if DefaultEncoding is not defined set to system's current code-page 
+    GET_INT_VALUE_FROM_INISECTION(DefaultEncoding, CPI_NONE, CED_NO_MAPPING, Encoding_CountOf()-1);
+    // if DefaultEncoding is not defined set to UTF-8 //~system's current code-page 
     Settings.DefaultEncoding = ((Settings.DefaultEncoding == CPI_NONE) ?
-      Encoding_MapIniSetting(true, (int)GetACP()) : Encoding_MapIniSetting(true, Settings.DefaultEncoding));
+      PREFERRED_DEFAULT_ENCODING : Encoding_MapIniSetting(true, Settings.DefaultEncoding));
 
     GET_BOOL_VALUE_FROM_INISECTION(UseDefaultForFileEncoding, false);
     GET_BOOL_VALUE_FROM_INISECTION(SkipUnicodeDetection, false);
     GET_BOOL_VALUE_FROM_INISECTION(SkipANSICodePageDetection, false);
-    GET_BOOL_VALUE_FROM_INISECTION(LoadASCIIasUTF8, false);
+    GET_BOOL_VALUE_FROM_INISECTION(LoadASCIIasUTF8, true);
     GET_BOOL_VALUE_FROM_INISECTION(LoadNFOasOEM, true);
     GET_BOOL_VALUE_FROM_INISECTION(NoEncodingTags, false);
     GET_INT_VALUE_FROM_INISECTION(DefaultEOLMode, SC_EOL_CRLF, SC_EOL_CRLF, SC_EOL_LF);