--- rxvt-unicode/src/command.C	2011/09/01 08:11:26	1.497
+++ rxvt-unicode/src/command.C	2011/12/05 13:36:56	1.503
@@ -778,13 +778,28 @@
           if (newlen)
             len = strlen (kbuf);
 
-          /*
-           * Pass meta for all function keys, if 'meta' option set
-           */
+          if (len > 0)
+            {
+              /*
+               * 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@"
+               */
+              if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
+                kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
+
+              /*
+               * Pass meta for all function keys, if 'meta' option set
+               */
 #ifdef META8_OPTION
-          if (meta && (meta_char == 0x80) && len > 0)
-            kbuf[len - 1] |= 0x80;
+              if (meta && (meta_char == 0x80))
+                kbuf[len - 1] |= 0x80;
 #endif
+            }
 
         }
       else if (ctrl && keysym == XK_minus)
@@ -828,20 +843,6 @@
         want_refresh = 1;
       }
 
-  /*
-   * 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
 #ifdef META8_OPTION
@@ -1718,6 +1719,7 @@
       h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
       XSetWMHints (dpy, parent, h);
       urgency_hint = enable;
+      XFree (h);
     }
 }
 #endif
@@ -2887,11 +2889,11 @@
 #endif
 
       case CSI_CUU:		/* 8.3.22: (1) CURSOR UP */
-      case CSI_VPR:		/* 8.3.161: (1) LINE POSITION FORWARD */
+      case CSI_VPB:		/* 8.3.160: (1) LINE POSITION BACKWARD */
         arg[0] = -arg[0];
         /* FALLTHROUGH */
       case CSI_CUD:		/* 8.3.19: (1) CURSOR DOWN */
-      case CSI_VPB:		/* 8.3.160: (1) LINE POSITION BACKWARD */
+      case CSI_VPR:		/* 8.3.161: (1) LINE POSITION FORWARD */
         scr_gotorc (arg[0], 0, RELATIVE);
         break;