2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5fa2404a243..2e9e19fd547 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * coding.c (decode_coding_gap): Don't remove the character before
+        a newline unless it's a CR character.  (Bug#14287)
+
 2013-04-28  Dan Nicolaescu  <dann@gnu.org>
 
         * dispextern.h (struct face): Move enum face_underline_type
diff --git a/src/coding.c b/src/coding.c
index b9fb92c481b..f6664e179b7 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7774,7 +7774,7 @@ decode_coding_gap (struct coding_system *coding,
               while (src_beg < src)
                 {
                   *--dst = *--src;
-                  if (*src == '\n')
+                  if (*src == '\n' && src > src_beg && src[-1] == '\r')
                     src--;
                 }
               diff = dst - src;