From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 24 Oct 2000 09:17:31 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~635
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23afac0140b30533b624de9892e7eb5e4b2b06cf;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8914eaf38d7..f8931efb9b2 100644
--- 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 d5cf192dc1a..0af44a4011d 100644
--- 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.