--- a/src/event-stream.c	Wed Jan 20 07:05:57 2010 -0600
+++ b/src/event-stream.c	Wed Feb 24 01:58:04 2010 -0600
@@ -2,7 +2,7 @@
    Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Board of Trustees, University of Illinois.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 1995, 1996, 2001, 2002, 2003, 2005 Ben Wing.
+   Copyright (C) 1995, 1996, 2001, 2002, 2003, 2005, 2010 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -255,13 +255,14 @@
 Fixnum debug_emacs_events;
 
 static void
-external_debugging_print_event (const char *event_description, Lisp_Object event)
+external_debugging_print_event (const Ascbyte *event_description,
+				Lisp_Object event)
 {
-  write_c_string (Qexternal_debugging_output, "(");
-  write_c_string (Qexternal_debugging_output, event_description);
-  write_c_string (Qexternal_debugging_output, ") ");
+  write_ascstring (Qexternal_debugging_output, "(");
+  write_ascstring (Qexternal_debugging_output, event_description);
+  write_ascstring (Qexternal_debugging_output, ") ");
   print_internal (event,	     Qexternal_debugging_output, 1);
-  write_c_string (Qexternal_debugging_output, "\n");
+  write_ascstring (Qexternal_debugging_output, "\n");
 }
 #define DEBUG_PRINT_EMACS_EVENT(event_description, event) do {	\
   if (debug_emacs_events)					\
@@ -356,7 +357,7 @@
   struct command_builder *b = (struct command_builder *) header;
   if (b->echo_buf)
     {
-      xfree (b->echo_buf, Ibyte *);
+      xfree (b->echo_buf);
       b->echo_buf = 0;
     }
 }
@@ -449,7 +450,7 @@
 {
   if (builder->echo_buf)
     {
-      xfree (builder->echo_buf, Ibyte *);
+      xfree (builder->echo_buf);
       builder->echo_buf = NULL;
     }
   FREE_LISP_OBJECT (wrap_command_builder (builder));
@@ -828,7 +829,7 @@
 
   help = IGNORE_MULTIPLE_VALUES (Feval (Vhelp_form));
   if (STRINGP (help))
-    internal_with_output_to_temp_buffer (build_string ("*Help*"),
+    internal_with_output_to_temp_buffer (build_ascstring ("*Help*"),
 					 print_help, help, Qnil);
   Fnext_command_event (event, Qnil);
   /* Remove the help from the frame */
@@ -4101,7 +4102,7 @@
 }
 
 static int
-is_scrollbar_event (Lisp_Object event)
+is_scrollbar_event (Lisp_Object USED_IF_SCROLLBARS (event))
 {
 #ifdef HAVE_SCROLLBARS
   Lisp_Object fun;
@@ -4934,9 +4935,9 @@
   last_point_position_buffer = Qnil;
   staticpro (&last_point_position_buffer);
 
-  QSnext_event_internal = build_string ("next_event_internal()");
+  QSnext_event_internal = build_ascstring ("next_event_internal()");
   staticpro (&QSnext_event_internal);
-  QSexecute_internal_event = build_string ("execute_internal_event()");
+  QSexecute_internal_event = build_ascstring ("execute_internal_event()");
   staticpro (&QSexecute_internal_event);
 
   DEFVAR_LISP ("echo-keystrokes", &Vecho_keystrokes /*