--- rxvt-unicode/src/keyboard.C	2011/11/27 12:12:49	1.49
+++ rxvt-unicode/src/keyboard.C	2011/12/02 09:13:50	1.53
@@ -100,55 +100,19 @@
 
 keyboard_manager::~keyboard_manager ()
 {
-  hash [0] = 2;
-
   for (unsigned int i = 0; i < keymap.size (); ++i)
     {
       free (keymap [i]->str);
       delete keymap [i];
-      keymap [i] = 0;
     }
-
-  keymap.clear ();
 }
 
 // a wrapper for register_translation that converts the input string
 // to utf-8 and expands 'list' syntax.
 void
-keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
+keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
 {
-  wchar_t *wc = rxvt_mbstowcs (trans);
-  char *translation = rxvt_wcstoutf8 (wc);
-  free (wc);
-
-  if (strncmp (translation, "list", 4) == 0 && translation [4]
-      && strlen (translation) < STRING_MAX)
-    {
-      char *prefix = translation + 4;
-      char *middle = strchr  (prefix + 1, translation [4]);
-      char *suffix = strrchr (prefix + 1, translation [4]);
-
-      if (suffix && middle && suffix > middle + 1)
-        {
-          int range = suffix - middle - 1;
-          int prefix_len = middle - prefix - 1;
-          char buf[STRING_MAX];
-
-          memcpy (buf, prefix + 1, prefix_len);
-          strcpy (buf + prefix_len + 1, suffix + 1);
-
-          for (int i = 0; i < range; i++)
-            {
-              buf [prefix_len] = middle [i + 1];
-              register_translation (keysym + i, state, strdup (buf));
-            }
-
-          free (translation);
-          return;
-        }
-      else
-        rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
-    }
+  char *translation = rxvt_wcstoutf8 (ws);
 
   register_translation (keysym, state, translation);
 }
@@ -204,10 +168,10 @@
 
       if (key->type != keysym_t::BUILTIN)
         {
-          wchar_t *wc = rxvt_utf8towcs (key->str);
-          char *str = rxvt_wcstombs (wc);
+          wchar_t *ws = rxvt_utf8towcs (key->str);
+          char *str = rxvt_wcstombs (ws);
           // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
-          free (wc);
+          free (ws);
 
           output_string (term, str);