[ViewVC] Diff of: cvs/rxvt-unicode/src/xdefaults.C

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.113 by ayin, Sat Sep 8 20:54:51 2007 UTC vs.
Revision 1.114 by sasha, Wed Sep 12 21:06:08 2007 UTC

               RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"),
 #endif				/* NO_CURSORCOLOR */
               STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
               STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
               STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
               RSTRG (Rs_path, "path", "search path"),
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
 #endif
               /* fonts: command-line option = resource name */
               STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
                                     "+zh-ext"
 #endif
                                     ","
 #if OFF_FOCUS_FADING
                                     "fade,"
-#endif
-#if defined(XPM_BACKGROUND)
-                                    "XPM,"
 #endif
 #if defined(ENABLE_TRANSPARENCY)
                                     "transparent,"
                                     "tint,"
 #endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines