Merge branch 'master' into sdl2.0

src/im.c

@@ -43,6 +43,12 @@
 #include <wchar.h>
 #include <assert.h>
 #include "im.h"
+#include "i18n.h"
+#include "debug.h"
+
+#ifdef DEBUG
+#include <assert.h>
+#endif
 
 #ifdef __ANDROID__
 #include "android_mbstowcs.h"
@@ -97,7 +103,9 @@ static const char *const im_tip_text[NUM_IM_TIPS] = {
 * CONSTANTS
 */
 
-/* #define IM_DEBUG       1 */
+#ifdef DEBUG
+#define IM_DEBUG         1
+#endif
 
 #define MAX_SECTIONS     8      /* Maximum numbers of sections in *.im file */
 #define MAX_UNICODE_SEQ 16      /* Output of state machine, including NUL */
@@ -1921,8 +1929,7 @@ void im_init(IM_DATA * im, int lang)
 
 #ifdef DEBUG
   assert(0 <= im->lang && im->lang < NUM_LANGS);
-  if (im_initialized)
-    printf("Initializing IM for %s...\n", lang_prefixes[im->lang]);
+  printf("Initializing IM for %s...\n", lang_prefixes[im->lang]);
 #endif
 
   /* Initialize the individual IM */