# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 971397765 0
# Node ID 98e7cf21e374980cb0c5b12ed5a4b75cb67b69bc
# Parent  8d3a703c5422d62671c3604f0ba54f2f95c94d44
*** empty log message ***

diff -r 8d3a703c5422 -r 98e7cf21e374 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Oct 12 22:42:56 2000 +0000
+++ b/lisp/ChangeLog	Fri Oct 13 00:42:45 2000 +0000
@@ -1,3 +1,8 @@
+2000-10-13  Kenichi Handa  <handa@etl.go.jp>
+
+	* international/mule-cmds.el (select-safe-coding-system): If FROM
+	is string, show it in *Warning* buffer.
+
 2000-10-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* startup.el (normal-top-level): Use display-popup-menus-p instead
@@ -24,6 +29,7 @@
 	(cperl-invalid-face): Revert last change.
 	(cperl-init-faces): Quote cperl-invalid-face.
 
+>>>>>>> 1.1252
 2000-10-12  Kenichi Handa  <handa@etl.go.jp>
 
 	* startup.el (fancy-splash-text): Remove superfluous quote.