--- rxvt-unicode/src/xdefaults.C	2012/06/04 15:18:53	1.165
+++ rxvt-unicode/src/xdefaults.C	2012/06/06 22:00:20	1.169
@@ -386,7 +386,7 @@
 #endif
                                     "\nUsage: ";		/* Usage */
 
-#define INDENT 18
+#define INDENT 28
 
 const char rxvt_term::resval_undef [] = "<undef>";
 const char rxvt_term::resval_on []    = "on";
@@ -394,8 +394,8 @@
 
 /*{{{ usage: */
 /*----------------------------------------------------------------------*/
-static void
-rxvt_usage (int type)
+void
+rxvt_term::rxvt_usage (int type)
 {
   unsigned int i, col;
 
@@ -413,9 +413,11 @@
 
               if (optList[i].arg)
                 len = strlen (optList[i].arg) + 1;
+
               assert (optList[i].opt != NULL);
               len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
               col += len;
+
               if (col > 79)
                 {
                   /* assume regular width */
@@ -424,6 +426,7 @@
                 }
 
               rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt);
+
               if (optList[i].arg)
                 rxvt_log (" %s]", optList[i].arg);
               else
@@ -446,6 +449,12 @@
                          (optList_isBool (i) ? "turn on/off " : ""),
                          optList[i].desc);
             }
+
+#if ENABLE_PERL
+        rxvt_perl.init (this);
+        rxvt_perl.usage (this, 1);
+#endif
+
         rxvt_log ("\n  --help to list long-options");
         break;
 
@@ -457,8 +466,14 @@
           if (optList[i].kw != NULL)
             rxvt_log ("  %s: %*s%s\n",
                     optList[i].kw,
-                    (INDENT - strlen (optList[i].kw)), "", /* XXX */
+                    (INDENT + 2 - strlen (optList[i].kw)), "", /* XXX */
                     (optList_isBool (i) ? "boolean" : optList[i].arg));
+
+#if ENABLE_PERL
+        rxvt_perl.init (this);
+        rxvt_perl.usage (this, 2);
+#endif
+
         rxvt_log ("\n  -help to list options");
         break;
     }
@@ -533,7 +548,7 @@
 
               if (optList[entry].doff != -1)
                 {
-                  if (flag && i+1 == argc)
+                  if (flag && i + 1 == argc)
                     rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
 
                   rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
@@ -551,14 +566,14 @@
 #ifndef NO_RESOURCES
       else if (!strcmp (opt, "xrm"))
         {
-          if (i+1 < argc)
+          if (i + 1 < argc)
             XrmPutLineResource (&option_db, argv[++i]);
         }
 #endif
 #ifdef KEYSYM_RESOURCE
       else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
         {
-          if (i+1 < argc)
+          if (i + 1 < argc)
             {
               char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6);
               sprintf (res, "*.%s: %s\n", opt, argv[i]);
@@ -568,15 +583,36 @@
 #endif
       else if (!strcmp (opt, "e"))
         {
-          if (i+1 == argc)
-            rxvt_fatal ("option '-e' requires an argument, aborting.\n");
+          if (i + 1 < argc)
+            return (const char **)argv + i + 1;
 
-          return (const char **)argv + i + 1;
+          rxvt_warn ("option '-e' requires an argument, aborting.\n");
+          bad_option = 1;
         }
       else
         {
-          bad_option = 1;
-          rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
+#if ENABLE_PERL
+          rxvt_perl.init (this);
+
+          if (int flags = rxvt_perl.parse_resource (this, opt, true, longopt, flag, argv [i + 1]))
+            {
+              if (flags & rxvt_perl.RESOURCE_ARG)
+                {
+                  if (i + 1 == argc)
+                    {
+                      rxvt_warn ("option '%s' requires an argument.\n", argv [i]);
+                      bad_option = 1;
+                    }
+                  else
+                    ++i;
+                }
+            }
+          else
+#endif
+            {
+              rxvt_warn ("\"%s\": unknown or malformed option.\n", opt);
+              bad_option = 1;
+            }
         }
     }
 
@@ -797,7 +833,7 @@
 #endif
 }
 
-#if !defined NO_RESOURCES && (defined KEYSYM_RESOURCE || defined BG_IMAGE_FROM_FILE)
+#if !defined NO_RESOURCES && defined KEYSYM_RESOURCE
 void
 rxvt_term::find_resources (const char *n_prefix, const char *c_prefix, int mode,
                            Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer))