From debfea2072621329b1144e27803ab74ac1d2811f Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 28 Sep 2014 08:51:57 +0000
Subject: [PATCH] RichEdit: Fixed issue of changing format after Enter

git-svn-id: svn://ultimatepp.org/upp/trunk@7740 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/RichEdit/Kbd.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/uppsrc/RichEdit/Kbd.cpp b/uppsrc/RichEdit/Kbd.cpp
index 5ef35e31b..3f46e772a 100644
--- a/uppsrc/RichEdit/Kbd.cpp
+++ b/uppsrc/RichEdit/Kbd.cpp
@@ -63,14 +63,18 @@ bool RichEdit::Key(dword key, int count)
 	case K_SHIFT_CTRL_Z:
 		Redo();
 		return true;
-	case K_ENTER:
-		if(singleline)
-			return false;
-		if(!RemoveSelection() && InsertLineSpecial())
-			return true;
-		InsertLine();
-		ShowFormat();
-		FinishNF();
+	case K_ENTER: {
+			if(singleline)
+				return false;
+			if(!RemoveSelection() && InsertLineSpecial())
+				return true;
+			
+			RichText::FormatInfo f = formatinfo;
+			InsertLine();
+			formatinfo = f;
+			ShowFormat();
+			FinishNF();
+		}
 		return true;
 	case K_CTRL_ENTER:
 		{