--- rxvt-unicode/src/init.C	2006/01/06 05:28:55	1.133
+++ rxvt-unicode/src/init.C	2006/01/08 01:02:15	1.136
@@ -11,7 +11,7 @@
  *                              - extensive modifications
  * Copyright (c) 1999      D J Hawkey Jr <hawkeyd@visi.com>
  *                              - QNX support
- * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -393,7 +393,7 @@
 
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
-    CLR_OPTION (Opt_scrollBar);
+    set_option (Opt_scrollBar, 0);
 
 #ifdef PRINTPIPE
   if (!rs[Rs_print_pipe])
@@ -1093,7 +1093,7 @@
 
   if (OPTION (Opt_pointerBlank)
 #ifdef ENABLE_PERL
-      || self
+      || perl.self
 #endif
       )
     vt_emask |= PointerMotionMask;