--- rxvt-unicode/src/rxvt.h	2007/11/22 15:07:10	1.322
+++ rxvt-unicode/src/rxvt.h	2007/11/27 17:45:47	1.326
@@ -20,6 +20,7 @@
 # define ENABLE_XIM_ONTHESPOT 1
 # define CURSOR_BLINK         1
 # define OPTION_HC            1
+# define BUILTIN_GLYPHS       1
 #else
 # define ENABLE_MINIMAL 1
 #endif
@@ -1054,7 +1055,7 @@
 #ifdef HAVE_BG_PIXMAP
   int update_background ();
 #if TRACE_PIXMAPS
-  int trace_update_background (const char* file, int line);
+  int trace_update_background (const char *file, int line);
 # define update_background() trace_update_background (__FILE__, __LINE__)
 #endif
   void update_background_cb (ev::timer &w, int revents);
@@ -1272,11 +1273,19 @@
 
   bool option (uint8_t opt) const NOTHROW
   {
+    if (!opt)
+      return 0;
+
+    --opt;
     return options[opt >> 3] & (1 << (opt & 7));
   }
 
   void set_option (uint8_t opt, bool set = true) NOTHROW
   {
+    if (!opt)
+      return;
+
+    --opt;
     if (set)
       options[opt >> 3] |= (1 << (opt & 7));
     else