From: Kenichi Handa <handa@m17n.org>
Date: Tue, 18 Dec 2007 02:29:25 +0000 (+0000)
Subject: (fontset_find_font): Fix previous change.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~127
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53b26aae438806656ecc0aa47e12783254e87e2f;p=emacs.git

(fontset_find_font): Fix previous change.
---

diff --git a/src/fontset.c b/src/fontset.c
index 4b89e6a279b..09a57b08a86 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -614,23 +614,17 @@ fontset_find_font (fontset, c, face, id, fallback)
 	      if (! NILP (script))
 		{
 		  Lisp_Object font_spec = Ffont_spec (0, NULL);
-	      
+		  Lisp_Object args[2], tmp;	      
+
 		  ASET (font_spec, FONT_REGISTRY_INDEX, Qiso10646_1);
 		  ASET (font_spec, FONT_EXTRA_INDEX,
 			Fcons (Fcons (QCscript, script), Qnil));
-		  if (NILP (elt))
-		    elt = Fvector (1, &font_spec);
-		  else
-		    {
-		      Lisp_Object args[2], tmp;
-
-		      args[0] = elt;
-		      tmp = Fmake_vector (make_number (3), Qnil);
-		      ASET (tmp, 0, font_spec);
-		      ASET (tmp, 1, CHARSET_SYMBOL_ID (Qunicode_bmp));
-		      args[1] = Fvector (1, &tmp);
-		      elt = Fvconcat (2, args);
-		    }
+		  args[0] = elt;
+		  tmp = Fmake_vector (make_number (3), Qnil);
+		  ASET (tmp, 0, font_spec);
+		  ASET (tmp, 1, CHARSET_SYMBOL_ID (Qunicode_bmp));
+		  args[1] = Fvector (1, &tmp);
+		  elt = Fvconcat (2, args);
 		}
 	    }
 	}