# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 972379051 0
# Node ID a82fae321afc1d29c3d17684d11a71d7d8cbdae5
# Parent  7d91ceb035367c0a5823f7da3c27569df004db35
*** empty log message ***

diff -r 7d91ceb03536 -r a82fae321afc lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Oct 24 09:15:44 2000 +0000
+++ b/lisp/ChangeLog	Tue Oct 24 09:17:31 2000 +0000
@@ -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 -r 7d91ceb03536 -r a82fae321afc src/ChangeLog
--- a/src/ChangeLog	Tue Oct 24 09:15:44 2000 +0000
+++ b/src/ChangeLog	Tue Oct 24 09:17:31 2000 +0000
@@ -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.