--- rxvt-unicode/src/rsinc.h	2007/06/09 09:05:38	1.16
+++ rxvt-unicode/src/rsinc.h	2008/01/27 22:48:33	1.25
@@ -16,20 +16,19 @@
 #endif
   def (name)
   def (title)
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
   def (path)
   def (backgroundPixmap)
 #endif
   def (loginShell)
   def (jumpScroll)
-#ifdef HAVE_SCROLLBARS
+  def (skipScroll)
   def (scrollBar)
   def (scrollBar_right)
   def (scrollBar_floating)
   def (scrollBar_align)
   def (scrollstyle)
   def (scrollBar_thickness)
-#endif
   def (scrollTtyOutput)
   def (scrollTtyKeypress)
   def (scrollWithBuffer)
@@ -51,7 +50,6 @@
 #ifndef NO_DELETE_KEY
   def (delete_key)
 #endif
-  def (selectstyle)
 #ifdef PRINTPIPE
   def (print_pipe)
 #endif
@@ -59,12 +57,13 @@
   def (preeditType)
   def (inputMethod)
 #endif
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
   def (transparent)
-  def (transparent_all)
+  def (shade)
 #endif
 #if XFT
   def (depth)
+  def (buffered)
 #endif
 #if ENABLE_FRILLS
   def (transient_for)
@@ -76,9 +75,11 @@
   def (borderLess)
   def (lineSpace)
   def (cursorUnderline)
-  def (skipBuiltinGlyphs)
   def (urgentOnBell)
 #endif
+#ifdef BUILTIN_GLYPHS
+  def (skipBuiltinGlyphs)
+#endif
 #if CURSOR_BLINK
   def (cursorBlink)
 #endif
@@ -102,9 +103,6 @@
 #ifdef OFF_FOCUS_FADING
   def (fade)
 #endif
-#ifdef TINTING
-  def (shade)
-#endif
 #if ENABLE_PERL
   def (perl_eval)
   def (perl_ext_1)