diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e39f46f2bc5..8d1b90bcfcb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-23  Kenichi Handa  <handa@m17n.org>
+
+	* international/mule-conf.el: Don't define the charset `emacs'
+	here, just put :docstring, :short-name, and :long-name.
+
+2008-05-22  Kenichi Handa  <handa@m17n.org>
+
+	* international/mule-diag.el (font-show-log): Limit each listing
+	to 20 items.
+
 2008-05-23  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdb-enable-debug): New function.
@@ -17,11 +27,12 @@
 	* vc-bzr.el (vc-bzr-annotate-time): Reduce memory allocation.
 	(vc-bzr-revision-completion-table): Handle `boundaries' argument.
 
-	* minibuffer.el (completion-boundaries): Change calling convention, so
-	`string' has the same semantics as in try-completion and all-completions.
+	* minibuffer.el (completion-boundaries): Change calling
+	convention, so `string' has the same semantics as in
+	try-completion and all-completions.
 	(completion-table-with-context, completion--embedded-envvar-table)
-	(completion--file-name-table, completion-pcm--find-all-completions):
-	Adjust code accordingly.
+	(completion--file-name-table)
+	(completion-pcm--find-all-completions): Adjust code accordingly.
 
 2008-05-22  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 6b87374f2f1..6fe69aa6630 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -68,6 +68,14 @@
 ;;   :ascii-compatible-p t
 ;;   :code-offset 0)
 ;;
+;; (define-charset 'emacs
+;;   ""
+;;   :dimension 3
+;;   :code-space [0 255 0 255 0 63]
+;;   :ascii-compatible-p t
+;;   :supplementary-p t
+;;   :code-offset 0)
+;;
 ;; (define-charset 'eight-bit
 ;;   ""
 ;;   :dimension 1
@@ -94,18 +102,18 @@
  'unicode :short-name "Unicode")
 (put-charset-property
  'unicode :long-name "Unicode (ISO10646)")
+(put-charset-property
+ 'emacs :docstring "Full Emacs charset (excluding eight bit chars)")
+(put-charset-property
+ 'emacs :short-name "Emacs")
+(put-charset-property
+ 'emacs :long-name "Emacs")
+
 (put-charset-property 'eight-bit :docstring "Raw bytes 0-255")
 (put-charset-property 'eight-bit :short-name "Raw bytes")
 
 (define-charset-alias 'ucs 'unicode)
 
-(define-charset 'emacs
-  "Full Emacs characters"
-  :ascii-compatible-p t
-  :code-space [ 0 255 0 255 0 63 ]
-  :code-offset 0
-  :supplementary-p t)
-
 (define-charset 'latin-iso8859-1
   "Right-Hand Part of ISO/IEC 8859/1 (Latin-1): ISO-IR-100"
   :short-name "RHP of Latin-1"