From: Kenichi Handa <handa@m17n.org>
Date: Mon, 18 Aug 2003 12:39:14 +0000 (+0000)
Subject: (encode-char): Fix for the ASCII case.
X-Git-Tag: ttn-vms-21-2-B4~9070
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bb55c6c97ea83e50e418352df7c0034b47abb368;p=emacs.git

(encode-char): Fix for the ASCII case.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38cadc84bc2..b450df03a92 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-18  Kenichi Handa  <handa@m17n.org>
+
+	* international/mule.el (encode-char): Fix for the ASCII case.
+
+2003-08-15  Kenichi Handa  <handa@m17n.org>
+
+	* international/fontset.el (setup-default-fontset): Change "*" to
+	nil in the specifications of font family.
+
 2003-08-18  Kim F. Storm  <storm@cua.dk>
 
 	* kmacro.el (kmacro-keymap): Group related bindings in
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index f37c3704cf2..f15e604c037 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -370,7 +370,7 @@ code-point in CCS.  Currently not supported and just ignored."
 		     (setq split (split-char trans)
 			   charset (car split)))
 		 (cond ((eq charset 'ascii)
-			char)
+			(or trans char))
 		       ((eq charset 'latin-iso8859-1)
 			(+ (nth 1 split) 128))
 		       ((eq charset 'mule-unicode-0100-24ff)