--- rxvt-unicode/src/command.C	2004/02/22 12:34:53	1.53
+++ rxvt-unicode/src/command.C	2004/02/22 20:08:18	1.55
@@ -112,10 +112,19 @@
           if (status_return == XLookupChars
               || status_return == XLookupBoth)
             {
-              wkbuf[len] = 0;
-              len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
-              if (len < 0)
-                len = 0;
+              /* make sure the user can type ctrl-@, i.e. NUL */
+              if (len == 1 && *wkbuf == 0)
+                {
+                  kbuf[0] = 0;
+                  len = 1;
+                }
+              else
+                {
+                  wkbuf[len] = 0;
+                  len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
+                  if (len < 0)
+                    len = 0;
+                }
             }
           else
             len = 0;
@@ -655,25 +664,23 @@
   /* escape prefix */
   if (meta
 #ifdef META8_OPTION
-      && (meta_char == C0_ESC)
+      && meta_char == C0_ESC
 #endif
      )
     {
       const unsigned char ch = C0_ESC;
-
       tt_write (&ch, 1);
     }
-#ifdef DEBUG_CMD
-  if (debug_key)
-    {		/* Display keyboard buffer contents */
-      char           *p;
-      int             i;
-
-      fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
-      for (i = 0, p = kbuf; i < len; i++, p++)
-        fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
-      fprintf (stderr, "'\n");
-    }
+
+#if defined(DEBUG_CMD)
+  /* Display keyboard buffer contents */
+  unsigned char *p;
+  int i;
+
+  fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
+  for (i = 0, p = kbuf; i < len; i++, p++)
+    fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
+  fprintf (stderr, "'\n");
 #endif				/* DEBUG_CMD */
   tt_write (kbuf, (unsigned int)len);
 }
@@ -2696,10 +2703,6 @@
             case 8:			/* unofficial extension */
               xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
               break;
-
-            case XTerm_locale:		/* unofficial extension */
-              tt_printf ("%-.250s\n", locale);
-              break;
           }
         break;
 
@@ -3081,8 +3084,13 @@
         change_font (str);
         break;
       case XTerm_locale:
-        set_locale (str);
-        im_cb ();
+        if (str[0] == '?' && !str[1])
+          tt_printf ("%-.250s\n", locale);
+        else
+          {
+            set_locale (str);
+            im_cb ();
+          }
         break;
 #if 0
       case XTerm_dumpscreen:	/* no error notices */