aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2000-11-23 20:37:45 +0000
committerEli Zaretskii2000-11-23 20:37:45 +0000
commit2bcdf6628b2e67d770605f1e37c25a2533e9460b (patch)
tree163ef87cb7064fb569ef91f560b84a7b29d73b04 /src
parent34f70eda7f649abf733481672d7925e6e9aa61bb (diff)
downloademacs-2bcdf6628b2e67d770605f1e37c25a2533e9460b.tar.gz
emacs-2bcdf6628b2e67d770605f1e37c25a2533e9460b.zip
(decode_coding_emacs_mule): Fix the case of
CODING_EOL_LF, which used an uninitialized value of c.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/coding.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0705bb33a5d..65395237df8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-11-23 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * coding.c (decode_coding_emacs_mule): Fix the case of
4 CODING_EOL_LF, which used uninitialized value of c.
5
12000-11-23 Stefan Monnier <monnier@cs.yale.edu> 62000-11-23 Stefan Monnier <monnier@cs.yale.edu>
2 7
3 * xdisp.c (syms_of_xdisp): Make fontification-functions buffer-local. 8 * xdisp.c (syms_of_xdisp): Make fontification-functions buffer-local.
diff --git a/src/coding.c b/src/coding.c
index f44efa9415e..fa79b0b4fdd 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -616,9 +616,8 @@ decode_coding_emacs_mule (coding, source, destination, src_bytes, dst_bytes)
616 616
617 if (*src == '\r') 617 if (*src == '\r')
618 { 618 {
619 int c; 619 int c = *src++;
620 620
621 src++;
622 if (coding->eol_type == CODING_EOL_CR) 621 if (coding->eol_type == CODING_EOL_CR)
623 c = '\n'; 622 c = '\n';
624 else if (coding->eol_type == CODING_EOL_CRLF) 623 else if (coding->eol_type == CODING_EOL_CRLF)