From: Kenichi Handa <handa@m17n.org>
Date: Tue, 27 Jan 2004 02:16:25 +0000 (+0000)
Subject: (translate_char): Accept list of translation tables.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1591
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10453be959b3656f9ed57336eab4e3ca77613304;p=emacs.git

(translate_char): Accept list of translation tables.
---

diff --git a/src/character.c b/src/character.c
index 70b7c476019..13a2da0ddbd 100644
--- a/src/character.c
+++ b/src/character.c
@@ -210,21 +210,28 @@ string_char (p, advanced, len)
 /* Translate character C by translation table TABLE.  If C is
    negative, translate a character specified by CHARSET and CODE.  If
    no translation is found in TABLE, return the untranslated
-   character.  */
+   character.  If TABLE is a list, elements are char tables.  In this
+   case, translace C by all tables.  */
 
 int
 translate_char (table, c)
      Lisp_Object table;
      int c;
 {
-  Lisp_Object ch;
-
-  if (! CHAR_TABLE_P (table))
-    return c;
-  ch = CHAR_TABLE_REF (table, c);
-  if (! CHARACTERP (ch))
-    return c;
-  return XINT (ch);
+  if (CHAR_TABLE_P (table))
+    {
+      Lisp_Object ch;
+
+      ch = CHAR_TABLE_REF (table, c);
+      if (CHARACTERP (ch))
+	c = XINT (ch);
+    }
+  else
+    {
+      for (; CONSP (table); table = XCDR (table))
+	c = translate_char (XCAR (table), c);
+    }
+  return c;
 }
 
 /* Convert the multibyte character C to unibyte 8-bit character based