--- rxvt-unicode/src/command.C	2011/04/29 10:10:20	1.484
+++ rxvt-unicode/src/command.C	2011/04/30 13:11:34	1.487
@@ -259,22 +259,19 @@
 void
 rxvt_term::commit_iso14755 ()
 {
-  wchar_t ch[2];
-
-  ch[0] = iso14755buf & ISO_14755_MASK;
-  ch[1] = 0;
+  wchar_t ch = iso14755buf & ISO_14755_MASK;
 
   if (iso14755buf & ISO_14755_51)
     {
-      char mb[16];
+      char mb[MB_LEN_MAX];
       int len;
 
       // allow verbatim 0-bytes and control-bytes to be entered
-      if (ch[0] >= 0x20)
-        len = wcstombs (mb, ch, 16);
+      if (ch >= 0x20)
+        len = wctomb (mb, ch);
       else
         {
-          mb[0] = ch[0];
+          mb[0] = ch;
           len = 1;
         }
 
@@ -2491,7 +2488,6 @@
 #endif /* PRINTPIPE */
 /*}}} */
 
-/* *INDENT-OFF* */
 enum {
   C1_40 = 0x40,
           C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
@@ -2499,7 +2495,6 @@
   C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
   C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
 };
-/* *INDENT-ON* */
 
 /*{{{ process non-printing single characters */
 void
@@ -2631,7 +2626,6 @@
 
   switch (ch)
     {
-        /* case 1:        do_tek_mode (); break; */
       case '#':
         if (cmd_getc () == '8')
           scr_E ();
@@ -2702,10 +2696,10 @@
         break;
 
         /* 8.3.142: SINGLE-SHIFT TWO */
-      /*case C1_SS2: scr_single_shift (2);   break; */
+      /* case C1_SS2: break; */
 
         /* 8.3.143: SINGLE-SHIFT THREE */
-      /*case C1_SS3: scr_single_shift (3);   break; */
+      /* case C1_SS3: break; */
 
         /* 8.3.27: DEVICE CONTROL STRING */
       case C1_DCS:		/* ESC P */
@@ -2748,7 +2742,6 @@
 /*}}} */
 
 /*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
-/* *INDENT-OFF* */
 enum {
   CSI_ICH = 0x40,
            CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
@@ -2778,7 +2771,6 @@
     make_byte (0,0,0,0,0,0,0,0),	/* p, q, r, s, t, u, v, w, */
     make_byte (0,0,0,0,0,0,0,0),	/* x, y, z, {, |, }, ~,    */
   };
-/* *INDENT-ON* */
 
 void
 rxvt_term::process_csi_seq ()
@@ -3098,7 +3090,6 @@
 /*}}} */
 
 #if !ENABLE_MINIMAL
-/* ARGSUSED */
 void
 rxvt_term::process_window_ops (const int *args, unsigned int nargs)
 {