*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8914eaf38d79627c8950c352e8852ca5493ae58f..f8931efb9b2eb035185d05687bb0a25f3e78c647 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-24  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * progmodes/cmacexp.el: Update the euthor's email address.
+
 2000-10-24  Miles Bader  <miles@lsi.nec.co.jp>
 
        * faces.el (face-spec-set-match-display): Add `graphic' display

diff --git a/src/ChangeLog b/src/ChangeLog
index d5cf192dc1af16c26f0bfcfb66582e3d0e680fe8..0af44a4011dd30f5ec6f38ffbc39fac33505916f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-24  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * coding.c (decode_coding_emacs_mule): If coding->eol_type is CR
+       or CRLF, decode EOLs.
+
 2000-10-24  Kenichi Handa  <handa@etl.go.jp>
 
        * window.c (Fdisplay_buffer): Fix doc.
@@ -32,7 +37,7 @@
        that when a font can't be exactly centered, it errs up rather than
        down.
 
-2000-10-22  ShengHuo ZHU  <zsh@cs.rochester.edu>
+2000-10-23  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * fns.c (Fbase64_decode_string): The decoded result should be
        unibyte.