From: handa <handa>
Date: Sun, 10 Jun 2007 12:26:51 +0000 (+0000)
Subject: (mlanguage_name_list): Fix previous change.
X-Git-Tag: FLT-base~16
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8cad110d82620e646fa1eb28a9630783ccdda8a;p=m17n%2Fm17n-lib.git

(mlanguage_name_list): Fix previous change.
---

diff --git a/src/language.c b/src/language.c
index 2a6c8f9..b32265d 100644
--- a/src/language.c
+++ b/src/language.c
@@ -534,43 +534,50 @@ mlanguage_name_list (MSymbol language, MSymbol target,
 
   MPLIST_DO (pl, plist)
     {
-      MPlist *p = MPLIST_PLIST (pl);
+      MPlist *p = MPLIST_PLIST (pl), *p0;
 
       if (MPLIST_SYMBOL (p) == script
 	  && (territory == Mnil
 	      || mplist_find_by_value (MPLIST_PLIST (MPLIST_NEXT (p)),
-				       territory)))
-	break;
+				       territory))
+	  && (p = MPLIST_NEXT (MPLIST_NEXT (p)))
+	  && ((p0 = mplist__assq (p, language))
+	      || (p0 = mplist__assq (p, language2))))
+	{
+	  plist = p0;
+	  break;
+	}
     }
   if (MPLIST_TAIL_P (pl))
     {
       MPLIST_DO (pl, plist)
 	{
-	  MPlist *p = MPLIST_NEXT (MPLIST_PLIST (pl));
+	  MPlist *p = MPLIST_NEXT (MPLIST_PLIST (pl)), *p0;
 
-	  if (territory == Mnil
-	      || mplist_find_by_value (MPLIST_VAL (MPLIST_NEXT (p)),
-				       territory))
-	    break;
+	  if ((territory == Mnil
+	       || mplist_find_by_value (MPLIST_VAL (p), territory))
+	      && (p = MPLIST_NEXT (MPLIST_NEXT (p)))
+	      && ((p0 = mplist__assq (p, language))
+		  || (p0 = mplist__assq (p, language2))))
+	    {
+	      plist = p0;
+	      break;
+	    }
 	}
       if (MPLIST_TAIL_P (pl))
-	pl = plist;
+	{
+	  pl = MPLIST_NEXT (MPLIST_NEXT (MPLIST_PLIST (plist)));
+	  if (! (plist = mplist__assq (pl, language)))
+	    plist = mplist__assq (pl, language2);
+	}
     }
 
-  /* PL = ((SCRIPT (TERRITORY ...) (LANG-CODE NAME ...) ...) ...)  */
-  plist = MPLIST_PLIST (pl);
-  plist = MPLIST_NEXT (MPLIST_NEXT (plist));
-  pl = mplist__assq (plist, language);
-  if (! pl && language2 != Mnil)
-    pl = mplist__assq (plist, language2);
-  if (! pl)
+  if (! plist)
     return NULL;
-  plist = MPLIST_PLIST (pl);
-  plist = MPLIST_NEXT (plist);
+  plist = MPLIST_NEXT (MPLIST_PLIST (plist));
   if (territory != Mnil)
     {
-      pl = MPLIST_NEXT (pl);
-      MPLIST_DO (pl, plist)
+      MPLIST_DO (pl, MPLIST_NEXT (plist))
 	if (MPLIST_SYMBOL_P (pl) && MPLIST_SYMBOL (pl) == territory)
 	  break;
       if (! MPLIST_TAIL_P (pl)