--- rxvt-unicode/src/command.C	2010/04/17 23:00:45	1.448
+++ rxvt-unicode/src/command.C	2010/08/18 17:45:42	1.453
@@ -773,7 +773,19 @@
                 {
                   int param = map_function_key (keysym);
                   if (param > 0)
-                    sprintf (kbuf,"\033[%d~", param);
+                    {
+                      int n = sprintf (kbuf,"\033[%d~", param);
+                      /*
+                       * pass Shift/Control indicators for function keys ending with `~'
+                       *
+                       * eg,
+                       *   Prior = "ESC[5~"
+                       *   Shift+Prior = "ESC[5$"
+                       *   Ctrl+Prior = "ESC[5^"
+                       *   Ctrl+Shift+Prior = "ESC[5@"
+                       */
+                      kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
+                    }
                   else
                     newlen = 0;
                 }
@@ -834,18 +846,8 @@
       }
 
   /*
-   * these modifications only affect the static keybuffer
-   * pass Shift/Control indicators for function keys ending with `~'
-   *
-   * eg,
-   *   Prior = "ESC[5~"
-   *   Shift+Prior = "ESC[5$"
-   *   Ctrl+Prior = "ESC[5^"
-   *   Ctrl+Shift+Prior = "ESC[5@"
    * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
    */
-  if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
-    kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
 
   /* escape prefix */
   if (meta
@@ -1485,12 +1487,12 @@
 
       case MapNotify:
 #ifdef HAVE_BG_PIXMAP
-        /* This is needed spcifically to fix the case of no window manager or a
+        /* This is needed specifically to fix the case of no window manager or a
          * non-reparenting window manager. In those cases we never get first
          * ConfigureNotify. Also that speeds startup under normal WM, by taking
-         * care of multiplicity of ConfigureNotify events arriwing while WM does
+         * care of multiplicity of ConfigureNotify events arriving while WM does
          * reparenting.
-         * We should not render background immidiately, as there could be several
+         * We should not render background immediately, as there could be several
          * ConfigureNotify's to follow. Lets take care of all of them in one scoop
          * by scheduling background redraw as soon as we can, but giving a short
          * bit of time for ConfigureNotifies to arrive.
@@ -1871,7 +1873,7 @@
 #ifdef MOUSE_REPORT_DOUBLECLICK
           if (ev.button == MEvent.button && clickintime)
             {
-              /* same button, within alloted time */
+              /* same button, within allowed time */
               MEvent.clicks++;
 
               if (MEvent.clicks > 1)
@@ -3233,13 +3235,12 @@
 void
 rxvt_term::process_dcs_seq ()
 {
-  char *s;
-  unicode_t eh;
-
   /*
    * Not handled yet
    */
-  s = get_to_st (eh);
+
+  unicode_t eh;
+  char *s = get_to_st (eh);
   if (s)
     free (s);
 
@@ -3253,15 +3254,15 @@
 void
 rxvt_term::process_osc_seq ()
 {
-  unicode_t ch, eh;
   int arg;
 
-  ch = cmd_getc ();
+  unicode_t ch = cmd_getc ();
   for (arg = 0; isdigit (ch); ch = cmd_getc ())
     arg = arg * 10 + (ch - '0');
 
   if (ch == ';')
     {
+      unicode_t eh;
       char *s = get_to_st (eh);
 
       if (s)
@@ -3400,13 +3401,14 @@
       case XTerm_Color_HC:
         process_color_seq (op, Color_HC, str, resp);
         break;
+      case XTerm_Color_HTC:
+        process_color_seq (op, Color_HTC, str, resp);
+        break;
 #endif
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-      case Rxvt_Color_BD:
       case URxvt_Color_BD:
         process_color_seq (op, Color_BD, str, resp);
         break;
-      case Rxvt_Color_UL:
       case URxvt_Color_UL:
         process_color_seq (op, Color_UL, str, resp);
         break;
@@ -3583,6 +3585,7 @@
         state = (SavedModes & bit) ? 1 : 0;	/* no overlapping */
       else
         state = (mode == 't') ? ! (priv_modes & bit) : mode;
+
       set_privmode (bit, state);
     }