--- rxvt-unicode/src/xdefaults.C	2007/05/01 14:46:23	1.98
+++ rxvt-unicode/src/xdefaults.C	2007/05/02 23:06:32	1.100
@@ -56,11 +56,11 @@
 
 /* BOOL () - regular boolean `-/+' flag */
 #define BOOL(rsp, kw, opt, option, flag, desc)			\
-    { option ## _idx, (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
+    { (option), (Optflag_Boolean | (flag)), (rsp), (kw), (opt), NULL, (desc)}
 
 /* SWCH () - `-' flag */
 #define SWCH(opt, option, flag, desc)				\
-    { option ## _idx, (flag), -1, NULL, (opt), NULL, (desc)}
+    { (option), (flag), -1, NULL, (opt), NULL, (desc)}
 
 /* convenient macros */
 #define optList_strlen(i)						\
@@ -123,6 +123,9 @@
 #endif
               BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
 #ifndef NO_BELL
+# if ENABLE_FRILLS
+              BOOL (Rs_urgentOnBell, "urgentOnBell", NULL, Opt_urgentOnBell, 0, "set the urgency hint for the wm on bell"),
+# endif
               BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, 0, "visual bell"),
 # if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
               BOOL (Rs_mapAlert, "mapAlert", NULL, Opt_mapAlert, 0, NULL),
@@ -551,7 +554,7 @@
             }
           else
             {		/* boolean value */
-              set_option (1UL << optList[entry].index, flag == resval_on);
+              set_option (optList[entry].index, flag == resval_on);
 
               if (optList[entry].doff != -1)
                 rs[optList[entry].doff] = flag;
@@ -829,7 +832,7 @@
               if (optList_isReverse (entry))
                 s = !s;
 
-              set_option (1UL << optList[entry].index, s);
+              set_option (optList[entry].index, s);
             }
         }
     }