From 7626f6857baac1dd9eec868dba2d3d78357bddba Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Fri, 12 Jan 2007 11:36:50 +0000
Subject: [PATCH] (handle_key): Handle a branch action of the initial state
 correctly.

---
 src/input.c |   57 +++++++++++++++++++++++++--------------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/input.c b/src/input.c
index 1fc55ff..cf4bad2 100644
--- a/src/input.c
+++ b/src/input.c
@@ -3423,47 +3423,40 @@ handle_key (MInputContext *ic)
     {
       /* MAP can not handle KEY.  */
 
-      /* If MAP is the root map of the initial state, it means that
-	 the current input method can not handle KEY.  */
-      if (map == ((MIMState *) MPLIST_VAL (im_info->states))->map)
+      /* Perform branch actions if any.  */
+      if (map->branch_actions)
 	{
-	  MDEBUG_PRINT (" unhandled\n");
-	  return -1;
+	  MDEBUG_PRINT (" branch-actions:");
+	  if (take_action_list (ic, map->branch_actions) < 0)
+	    {
+	      MDEBUG_PRINT ("\n");
+	      return -1;
+	    }
 	}
 
-      if (map != ic_info->state->map)
+      if (map == ic_info->map)
 	{
-	  /* If MAP is not the root map... */
-	  /* If MAP has branch actions, perform them.  */
-	  if (map->branch_actions)
+	  /* The above branch actions didn't change the state.  */
+
+	  /* If MAP is the root map of the initial state, it means
+	     that the current input method can not handle KEY.  */
+	  if (map == ((MIMState *) MPLIST_VAL (im_info->states))->map)
 	    {
-	      MDEBUG_PRINT (" branch-actions:");
-	      if (take_action_list (ic, map->branch_actions) < 0)
-		{
-		  MDEBUG_PRINT ("\n");
-		  return -1;
-		}
+	      MDEBUG_PRINT (" unhandled\n");
+	      return -1;
 	    }
-	  /* If MAP is still not the root map, shift to the current
-	     state. */
-	  if (ic_info->map != ic_info->state->map)
-	    shift_state (ic, ic_info->state->name);
-	}
-      else
-	{
-	  /* MAP is the root map, perform branch actions (if any) or
-	     shift to the initial state.  */
-	  if (map->branch_actions)
+
+	  if (map != ic_info->state->map)
 	    {
-	      MDEBUG_PRINT (" branch-actions:");
-	      if (take_action_list (ic, map->branch_actions) < 0)
-		{
-		  MDEBUG_PRINT ("\n");
-		  return -1;
-		}
+	      /* MAP is not the root map.  Shift to the root map of the
+		 current state. */
+	      shift_state (ic, ic_info->state->name);
 	    }
 	  else
-	    shift_state (ic, Mnil);
+	    {
+	      /* MAP is the root map.  Shift to the initial state.  */
+	      shift_state (ic, Mnil);
+	    }
 	}
     }
   MDEBUG_PRINT ("\n");
-- 
1.7.10.4