aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorJoakim Verona2013-04-30 08:31:50 +0200
committerJoakim Verona2013-04-30 08:31:50 +0200
commit7a1bee4a713304afdf8e58f31f59d3572fa00063 (patch)
tree509b38118c25728eb2ea8ebcb2220da706d8459d /src/coding.c
parent23e7d63bcc222e40e6063b6799de50544af8d70b (diff)
parent38d8527bab7f84b94d2e0a759e25a64f33838257 (diff)
downloademacs-7a1bee4a713304afdf8e58f31f59d3572fa00063.tar.gz
emacs-7a1bee4a713304afdf8e58f31f59d3572fa00063.zip
auto upstream
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c2
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,
7774 while (src_beg < src) 7774 while (src_beg < src)
7775 { 7775 {
7776 *--dst = *--src; 7776 *--dst = *--src;
7777 if (*src == '\n') 7777 if (*src == '\n' && src > src_beg && src[-1] == '\r')
7778 src--; 7778 src--;
7779 } 7779 }
7780 diff = dst - src; 7780 diff = dst - src;