--- rxvt-unicode/src/command.C	2011/11/24 11:28:51	1.500
+++ rxvt-unicode/src/command.C	2011/12/05 12:52:34	1.502
@@ -781,14 +781,6 @@
           if (len > 0)
             {
               /*
-               * Pass meta for all function keys, if 'meta' option set
-               */
-#ifdef META8_OPTION
-              if (meta && (meta_char == 0x80))
-                kbuf[len - 1] |= 0x80;
-#endif
-
-              /*
                * pass Shift/Control indicators for function keys ending with `~'
                *
                * eg,
@@ -799,6 +791,14 @@
                */
               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))
+                kbuf[len - 1] |= 0x80;
+#endif
             }
 
         }
@@ -1711,7 +1711,7 @@
 void
 rxvt_term::set_urgency (bool enable)
 {
-  if (enable == urgency_hint)
+  if (!(enable || urgency_hint))
     return;
 
   if (XWMHints *h = XGetWMHints (dpy, parent))