--- rxvt-unicode/src/command.C	2004/02/13 12:17:07	1.44
+++ rxvt-unicode/src/command.C	2004/02/21 21:15:03	1.48
@@ -90,7 +90,7 @@
       Status status_return;
 
 #ifdef X_HAVE_UTF8_STRING
-      if (enc_utf8 && 0)
+      if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
         len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
                                  KBUFSZ, &keysym, &status_return);
       else
@@ -360,7 +360,7 @@
                     if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
                       {
                         STRCPY (kbuf, "\033OZ");
-                        kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
+                        kbuf[2] = "txvr"[keysym - XK_KP_Left];
                         break;
                       }
                     else
@@ -373,14 +373,14 @@
                   case XK_Right:	/* "\033[C" */
                   case XK_Left:	/* "\033[D" */
                     STRCPY (kbuf, "\033[Z");
-                    kbuf[2] = ("DACB"[keysym - XK_Left]);
+                    kbuf[2] = "DACB"[keysym - XK_Left];
                     /* do Shift first */
                     if (shft)
-                      kbuf[2] = ("dacb"[keysym - XK_Left]);
+                      kbuf[2] = "dacb"[keysym - XK_Left];
                     else if (ctrl)
                       {
                         kbuf[1] = 'O';
-                        kbuf[2] = ("dacb"[keysym - XK_Left]);
+                        kbuf[2] = "dacb"[keysym - XK_Left];
                       }
                     else if (PrivateModes & PrivMode_aplCUR)
                       kbuf[1] = 'O';
@@ -949,7 +949,7 @@
         return *cmdbuf_ptr++;
 
       wchar_t wc;
-      size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
+      size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
 
       if (len == (size_t)-2)
         return NOCHAR;