[Emacs-diffs] /srv/bzr/emacs/trunk r112420: Fix bug #14287 with decoding EOL by *-dos coding systems.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112420
fixes bug: http://debbugs.gnu.org/14287
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2013-04-28 21:21:01 +0300
message:
  Fix bug #14287 with decoding EOL by *-dos coding systems.
  
   src/coding.c (decode_coding_gap): Don't remove the character before
   a newline unless it's a CR character.
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-04-28 13:11:16 +0000
+++ b/src/ChangeLog     2013-04-28 18:21:01 +0000
@@ -1,3 +1,8 @@
+2013-04-28  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * dispextern.h (struct face): Move enum face_underline_type

=== modified file 'src/coding.c'
--- a/src/coding.c      2013-04-24 15:09:49 +0000
+++ b/src/coding.c      2013-04-28 18:21:01 +0000
@@ -7774,7 +7774,7 @@
              while (src_beg < src)
                {
                  *--dst = *--src;
-                 if (*src == '\n')
+                 if (*src == '\n' && src > src_beg && src[-1] == '\r')
                    src--;
                }
              diff = dst - src;