--- rxvt-unicode/src/rxvt.h	2006/01/09 23:00:07	1.193
+++ rxvt-unicode/src/rxvt.h	2006/01/11 02:13:56	1.196
@@ -213,10 +213,6 @@
 # define NO_MOUSE_REPORT_SCROLLBAR 1
 #endif
 
-#ifdef NO_RESOURCES
-# undef USE_XGETDEFAULT
-#endif
-
 #if defined (ISO_14755) || defined (ENABLE_PERL)
 # define ENABLE_OVERLAY 1
 #endif
@@ -701,10 +697,12 @@
 #define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
-#define OPTION(opt)              (options & (opt))
-#define DEFAULT_OPTIONS          (Opt_scrollBar | Opt_scrollTtyOutput \
-                                  | Opt_jumpScroll | Opt_secondaryScreen \
-                                  | Opt_pastableTabs | Opt_intensityStyles)
+#define TEMP_ENV		temp_environ temp_environ (envv)
+
+#define OPTION(opt)		(options & (opt))
+#define DEFAULT_OPTIONS		(Opt_scrollBar | Opt_scrollTtyOutput \
+				 | Opt_jumpScroll | Opt_secondaryScreen \
+				 | Opt_pastableTabs | Opt_intensityStyles)
 
 // for m >= -n, ensure remainder lies between 0..n-1
 #define MOD(m,n) (((m) + (n)) % (n))
@@ -841,7 +839,7 @@
 
 #define SET_LOCALE(locale) rxvt_set_locale (locale)
 extern bool rxvt_set_locale (const char *locale);
-extern bool rxvt_push_locale (const char *locale);
+extern void rxvt_push_locale (const char *locale);
 extern void rxvt_pop_locale ();
 
 /****************************************************************************/
@@ -975,14 +973,9 @@
 struct rxvt_term : zero_initialized, rxvt_vars {
   log_callback   *log_hook;               // log error messages through this hook, if != 0
   getfd_callback *getfd_hook;           // convert remote to local fd, if != 0
-
 #if ENABLE_PERL
   rxvt_perl_term  perl;
 #endif
-#if USE_XGETDEFAULT
-  XrmDatabase     xrmdatabase;
-#endif
-
   struct mbstate  mbstate;              // current input multibyte state
 
   unsigned char   want_refresh:1,
@@ -1265,6 +1258,7 @@
 
   void init_secondary ();
   const char **init_resources (int argc, const char *const *argv);
+  const char *x_resource (const char *name);
   void init_env ();
   void set_locale (const char *locale);
   void init_xlocale ();