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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.79 by root, Mon Jan 16 09:28:17 2006 UTC vs.
Revision 1.80 by root, Mon Jan 16 15:00:20 2006 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"),
-#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
+#ifdef XPM_BACKGROUND
               RSTRG (Rs_path, "path", "search path"),
-#endif				/* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
-#ifdef XPM_BACKGROUND
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
-#endif				/* XPM_BACKGROUND */
-#if (MENUBAR_MAX)
-              RSTRG (Rs_menu, "menu", "name[;tag]"),
 #endif
               /* fonts: command-line option = resource name */
               STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
 #if ENABLE_STYLES
               STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"),
 #if TINTING
                                     "tint,"
 #endif
 #if defined(UTMP_SUPPORT)
                                     "utmp,"
-#endif
-#if defined(MENUBAR)
-                                    "menubar,"
 #endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
                                     "scrollbars="

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