From 751069ab836690ac00dae82ced4e82e3fdb03b9a Mon Sep 17 00:00:00 2001
From: gerr <g3rc4n@gmail.com>
Date: Thu, 22 Oct 2015 15:52:25 +0100
Subject: [PATCH] changed the semantics for fallback line endings.  When the
 file format (line endings), can't be deduced (empty files, files without any
 newlines), then the buffer uses the setting for the Newdocument

---
 PowerEditor/src/ScitillaComponent/Buffer.cpp | 26 +++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/PowerEditor/src/ScitillaComponent/Buffer.cpp b/PowerEditor/src/ScitillaComponent/Buffer.cpp
index 9a0e61fb1..a7c8de070 100644
--- a/PowerEditor/src/ScitillaComponent/Buffer.cpp
+++ b/PowerEditor/src/ScitillaComponent/Buffer.cpp
@@ -630,11 +630,11 @@ BufferID FileManager::loadFile(const TCHAR * filename, Document doc, int encodin
 			// 3 formats : WIN_FORMAT, UNIX_FORMAT and MAC_FORMAT
 			if (nullptr != UnicodeConvertor.getNewBuf())
 			{
-				FormatType format = getEOLFormatForm(UnicodeConvertor.getNewBuf(), UnicodeConvertor.getNewSize());
+				FormatType format = getEOLFormatForm(UnicodeConvertor.getNewBuf(), UnicodeConvertor.getNewSize(),ndds._format);
 				buf->setFormat(format);
 			}
 			else
-				buf->setFormat(FormatType::osdefault);
+				buf->setFormat(ndds._format);
 
 			UniMode um = UnicodeConvertor.getEncoding();
 			if (um == uni7Bit)
@@ -681,13 +681,17 @@ bool FileManager::reloadBuffer(BufferID id)
 	{
 		if (encoding == -1)
 		{
+			NppParameters *pNppParamInst = NppParameters::getInstance();
+			const NewDocDefaultSettings & ndds = (pNppParamInst->getNppGUI()).getNewDocDefaultSettings(); // for ndds._format
+			
 			if (nullptr != UnicodeConvertor.getNewBuf())
 			{
-				FormatType format = getEOLFormatForm(UnicodeConvertor.getNewBuf(), UnicodeConvertor.getNewSize());
+				FormatType format = getEOLFormatForm(UnicodeConvertor.getNewBuf(), UnicodeConvertor.getNewSize(),ndds._format);
 				buf->setFormat(format);
 			}
-			else
-				buf->setFormat(FormatType::osdefault);
+			else{
+				buf->setFormat(ndds._format);
+			}
 
 			buf->setUnicodeMode(UnicodeConvertor.getEncoding());
 		}
@@ -1464,7 +1468,17 @@ inline bool FileManager::loadFileData(Document doc, const TCHAR * filename, char
 
 	// broadcast the format
 	if (pFormat != nullptr)
-		*pFormat = (format != FormatType::unknown) ? format : FormatType::osdefault;
+	{
+		if (format == FormatType::unknown){
+			NppParameters *pNppParamInst = NppParameters::getInstance();
+			const NewDocDefaultSettings & ndds = (pNppParamInst->getNppGUI()).getNewDocDefaultSettings(); // for ndds._format
+			*pFormat = ndds._format;
+		}
+		else
+		{
+			*pFormat = format;
+		}
+	}
 
 	_pscratchTilla->execute(SCI_EMPTYUNDOBUFFER);
 	_pscratchTilla->execute(SCI_SETSAVEPOINT);