From 8084a3f5896e157c6e7dd08fa26b149e4c8e5393 Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Thu, 3 Dec 2009 07:22:46 +0000
Subject: [PATCH] (run_stages): Fix previous change. (mflt_run): Cancel
 previous change.

---
 src/m17n-flt.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/m17n-flt.c b/src/m17n-flt.c
index 03753a5..9f6eeb6 100644
--- a/src/m17n-flt.c
+++ b/src/m17n-flt.c
@@ -2271,7 +2271,8 @@ run_stages (MFLTGlyphString *gstring, int from, int to,
 	  MFLTGlyph *g = GREF (ctx->in, i);
 	  char enc;
 
-	  if (GET_COMBINED (g) || prev_category != ctx->stage->category)
+	  if (GET_COMBINED (g)
+	      || (prev_category && prev_category != ctx->stage->category))
 	    enc = (GET_ENCODED (g)
 		   ? (g->c > 0 ? (int) mchartable_lookup (table, g->c) : 1)
 		   : g->code
@@ -2961,7 +2962,6 @@ mflt_run (MFLTGlyphString *gstring, int from, int to,
       if (flt->need_config && font_id != Mnil)
 	flt = configure_flt (flt, font, font_id);
 
-#if 0
       for (; this_to < to; this_to++)
 	{
 	  char enc;
@@ -2971,7 +2971,6 @@ mflt_run (MFLTGlyphString *gstring, int from, int to,
 	    break;
 	  SET_CATEGORY_CODE (g, enc);
 	}
-#endif
 
       if (MDEBUG_FLAG ())
 	{
-- 
1.7.10.4