--- rxvt-unicode/src/screen.C	2006/11/02 17:23:50	1.267
+++ rxvt-unicode/src/screen.C	2007/05/01 21:30:01	1.268
@@ -49,7 +49,7 @@
  *             GENERAL SCREEN AND SELECTION UPDATE ROUTINES                  *
  * ------------------------------------------------------------------------- */
 #define ZERO_SCROLLBACK()                                              \
-    if (OPTION (Opt_scrollTtyOutput))                                  \
+    if (option (Opt_scrollTtyOutput))                                  \
         view_start = 0
 #define CLEAR_SELECTION()                                              \
     selection.beg.row = selection.beg.col                              \
@@ -512,7 +512,7 @@
 void
 rxvt_term::scr_swap_screen ()
 {
-  if (!OPTION (Opt_secondaryScreen))
+  if (!option (Opt_secondaryScreen))
     return;
 
   for (int i = prev_nrow; i--; )
@@ -544,7 +544,7 @@
   int i = current_screen; current_screen = scrn; scrn = i;
 
 #if NSCREENS
-  if (OPTION (Opt_secondaryScreen))
+  if (option (Opt_secondaryScreen))
     {
       num_scr = 0;
 
@@ -557,7 +557,7 @@
     }
   else
 #endif
-    if (OPTION (Opt_secondaryScroll))
+    if (option (Opt_secondaryScroll))
       scr_scroll_text (0, prev_nrow - 1, prev_nrow);
 }
 
@@ -626,7 +626,7 @@
 
   if (count > 0
       && row1 == 0
-      && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
+      && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
     {
       top_row = max (top_row - count, -saveLines);
 
@@ -686,7 +686,7 @@
         }
 
       // finally move the view window, if desired
-      if (OPTION (Opt_scrollWithBuffer)
+      if (option (Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != -saveLines)
         scr_page (UP, count);
@@ -1073,7 +1073,7 @@
 
       // store horizontal tab commands as characters inside the text
       // buffer so they can be selected and pasted.
-      if (ht && OPTION (Opt_pastableTabs))
+      if (ht && option (Opt_pastableTabs))
         {
           base_rend = SET_FONT (base_rend, 0);
 
@@ -1654,7 +1654,7 @@
       if (bgPixmap.pixmap == None)
 #endif
 #if TRANSPARENT
-        if (!OPTION (Opt_transparent) || am_transparent == 0)
+        if (!option (Opt_transparent) || am_transparent == 0)
 #endif
           XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 
@@ -1888,12 +1888,12 @@
 
 # ifndef NO_MAPALERT
 #  ifdef MAPALERT_OPTION
-  if (OPTION (Opt_mapAlert))
+  if (option (Opt_mapAlert))
 #  endif
     XMapWindow (dpy, parent[0]);
 # endif
 
-  if (OPTION (Opt_visualBell))
+  if (option (Opt_visualBell))
     {
       rvideo_bell = true;
       scr_rvideo_mode (rvideo_mode);
@@ -1998,7 +1998,7 @@
   have_bg |= bgPixmap.pixmap != None;
 #endif
 #if TRANSPARENT
-  have_bg |= OPTION (Opt_transparent) && am_transparent;
+  have_bg |= option (Opt_transparent) && am_transparent;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
 
@@ -2053,7 +2053,7 @@
 
         if (showcursor && focus)
           {
-            if (OPTION (Opt_cursorUnderline))
+            if (option (Opt_cursorUnderline))
               *crp ^= RS_Uline;
             else
               {
@@ -2396,7 +2396,7 @@
     {
       if (focus)
         {
-          if (OPTION (Opt_cursorUnderline))
+          if (option (Opt_cursorUnderline))
             *crp ^= RS_Uline;
           else
             {
@@ -3416,7 +3416,7 @@
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
-      if (OPTION (Opt_tripleclickwords))
+      if (option (Opt_tripleclickwords))
         {
           selection_delimit_word (UP, &selection.beg, &selection.beg);