--- rxvt-unicode/src/command.C	2005/02/21 19:26:07	1.201
+++ rxvt-unicode/src/command.C	2005/03/12 23:35:14	1.202
@@ -318,9 +318,11 @@
           // at the point of XOpenIM, so temporarily switch locales
           if (rs[Rs_imLocale])
             SET_LOCALE (rs[Rs_imLocale]);
+
           // assume wchar_t == unicode or better
           len = XwcLookupString (Input_Context, &ev, wkbuf,
                                  KBUFSZ, &keysym, &status_return);
+
           if (rs[Rs_imLocale])
             SET_LOCALE (locale);
 
@@ -3590,7 +3592,7 @@
 
       seen_esc = false;
 
-      if (n >= sizeof (string) - 1)
+      if (n >= STRING_MAX - 1)
         // stop at some sane length
         return NULL;