--- rxvt-unicode/src/rxvt.h	2006/01/13 05:13:09	1.202
+++ rxvt-unicode/src/rxvt.h	2006/01/15 06:02:40	1.204
@@ -5,6 +5,21 @@
 
 #include "feature.h"
 
+#if defined (ISO_14755) || defined (ENABLE_PERL)
+# define ENABLE_OVERLAY 1
+#endif
+
+#if ENABLE_PERL
+# define ENABLE_FRILLS 1
+# define ENABLE_COMBINING 1
+#endif
+
+#if ENABLE_FRILLS
+# define ENABLE_XEMBED 1
+# define ENABLE_EWMH   1
+# define CURSOR_BLINK  1
+#endif
+
 #include <limits.h>
 
 #include <X11/cursorfont.h>
@@ -23,20 +38,6 @@
 
 #include "rxvtperl.h"
 
-#if defined (ISO_14755) || defined (ENABLE_PERL)
-# define ENABLE_OVERLAY 1
-#endif
-
-#if ENABLE_PERL
-# define ENABLE_FRILLS
-#endif
-
-#if ENABLE_FRILLS
-# define ENABLE_XEMBED 1
-# define ENABLE_EWMH   1
-# define CURSOR_BLINK  1
-#endif
-
 /*
  *****************************************************************************
  * SYSTEM HACKS
@@ -1534,9 +1535,9 @@
   void set_font_style ();
   void scr_charset_choose (int set);
   void scr_charset_set (int set, unsigned int ch);
-  int scr_move_to (int y, int len);
-  int scr_page (enum page_dirn direction, int nlines);
-  int scr_changeview (unsigned int oldviewstart);
+  void scr_move_to (int y, int len);
+  bool scr_page (enum page_dirn direction, int nlines);
+  bool scr_changeview (int new_view_start);
   void scr_bell ();
   void scr_printscreen (int fullhist);
   void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);