diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-05-01 20:47:50 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-05-01 20:47:50 +0300 |
| commit | b1cb82edff21abfefd68af18370dddfd8cc1fec0 (patch) | |
| tree | fd8d8a1e1d99af024b52158a471457fc796238bc /src/coding.c | |
| parent | 10f81f3ac90f98160f611787e20dcad96bb500e9 (diff) | |
| parent | 2640d52e4e7873e41b0f0f1144177f84c345917e (diff) | |
Merge from trunk.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |