Merge branch 'master' into sdl2.0
Some things are still WIP, they need to be tested and addressed later.
This commit is contained in:
commit
eb7f55e289
145 changed files with 24137 additions and 9582 deletions
3
src/im.c
3
src/im.c
|
|
@ -455,6 +455,7 @@ static int sm_add(STATE_MACHINE * sm, char *seq, const wchar_t * unicode, char f
|
|||
return 1;
|
||||
}
|
||||
sm_init(next->state);
|
||||
sm_found = next->state;
|
||||
|
||||
/* Increase store for next time, if necessary */
|
||||
if (++(sm->next_size) >= sm->next_maxsize)
|
||||
|
|
@ -465,8 +466,6 @@ static int sm_add(STATE_MACHINE * sm, char *seq, const wchar_t * unicode, char f
|
|||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
sm_found = next->state;
|
||||
}
|
||||
|
||||
/* Recurse */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue