From d5eb1ce0262767d2cd5c70f2eb0823d98ae38288 Mon Sep 17 00:00:00 2001
From: ncaq <ncaq@ncaq.net>
Date: Thu, 22 Jun 2017 10:05:39 +0900
Subject: [PATCH 1/3] fixed: yesod-form: textareaField: writeHtmlEscapedChar:
 convert "\r\n" to "<br>"

---
 yesod-form/Yesod/Form/Fields.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 8833b2fc..5fe98d77 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -226,6 +226,7 @@ instance ToHtml Textarea where
         . unTextarea
       where
         -- Taken from blaze-builder and modified with newline handling.
+        writeHtmlEscapedChar '\r' = mempty
         writeHtmlEscapedChar '\n' = writeByteString "<br>"
         writeHtmlEscapedChar c    = B.writeHtmlEscapedChar c
 

From 33471cbb2f57ab0b1a8fedcbb4c5cf1fafd61d90 Mon Sep 17 00:00:00 2001
From: ncaq <ncaq@ncaq.net>
Date: Thu, 22 Jun 2017 16:32:50 +0900
Subject: [PATCH 2/3] add changelog and version number

---
 yesod-form/ChangeLog.md     | 4 ++++
 yesod-form/yesod-form.cabal | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/yesod-form/ChangeLog.md b/yesod-form/ChangeLog.md
index 3fa52a16..f1370845 100644
--- a/yesod-form/ChangeLog.md
+++ b/yesod-form/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.4.13
+
+* Fixed `textareaField` `writeHtmlEscapedChar` trim "\r"
+
 ## 1.4.12
 
 * Password field does not remember its previous value
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index 617ada59..177653d9 100644
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@@ -1,5 +1,5 @@
 name:            yesod-form
-version:         1.4.12
+version:         1.4.13
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>

From e19d220f61649ca39547f5e1880bc3d110d9f0c1 Mon Sep 17 00:00:00 2001
From: ncaq <ncaq@ncaq.net>
Date: Fri, 23 Jun 2017 08:54:36 +0900
Subject: [PATCH 3/3] fixed: import Data.Monoid for old ghc

---
 yesod-form/Yesod/Form/Fields.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index 5fe98d77..a8a537f0 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -106,6 +106,10 @@ import Data.Attoparsec.Text (Parser, char, string, digit, skipSpace, endOfInput,
 
 import Yesod.Persist.Core
 
+#if !MIN_VERSION_base(4,8,0)
+import Data.Monoid
+#endif
+
 defaultFormMessage :: FormMessage -> Text
 defaultFormMessage = englishFormMessage