--- rxvt-unicode/src/rxvtlib.h.in	2006/01/07 23:18:56	1.61
+++ rxvt-unicode/src/rxvtlib.h.in	2006/01/09 19:01:56	1.64
@@ -214,14 +214,6 @@
 # undef def
 };
 
-#define SET_OPTION(opt)		 (options |= (opt))
-#define CLR_OPTION(opt)		 (options &= ~(opt))
-#define OPTION(opt)              (options & (opt))
-#define OPTION_R(opt)            (r->options & (opt))
-#define DEFAULT_OPTIONS          (Opt_scrollBar | Opt_scrollTtyOutput \
-                                  | Opt_jumpScroll | Opt_secondaryScreen \
-                                  | Opt_pastableTabs | Opt_intensityStyles)
-
 /* ------------------------------------------------------------------------- */
 
 typedef struct {
@@ -251,7 +243,7 @@
 struct rxvt_vars : TermWin_t {
   scrollBar_t     scrollBar;
   menuBar_t       menuBar;
-  unsigned long   options;
+  uint32_t        options;
   XSizeHints      szHint;
   rxvt_display   *display;
   rxvt_color     *pix_colors;
@@ -264,9 +256,8 @@
   int             sb_shadow;    /* scrollbar shadow width                    */
   rxvt_ptytty     pty;
   int             numlock_state;
-  line_t         *row_buf;      // all lines, scrollback + terminal, circular
+  line_t         *row_buf;      // all lines, scrollback + terminal, circular, followed by temp_buf
   line_t         *drawn_buf;    // text on screen
-  line_t         *temp_buf;     // temporary buffer
   line_t         *swap_buf;     // lines for swap buffer
   char           *tabs;         /* per location: 1 == tab-stop               */
   screen_t        screen;
@@ -275,6 +266,7 @@
 };
 
 void rxvt_init ();
+bool rxvt_tainted ();
 
 #endif                          /* _RXVTLIB_H_ */