Mercurial > hg > xemacs-beta

--- a/configure	Tue Jun 04 17:40:00 2002 +0000
+++ b/configure	Wed Jun 05 09:58:45 2002 +0000
@@ -591,7 +591,7 @@

 		prefix | exec_prefix | bindir | datadir | statedir | libdir | \
 	mandir | infodir | infopath | lispdir | etcdir | pkgdir | \
-	archlibdir | docdir | package_path )
+	archlibdir | docdir | package_path | moduledir )
 	   	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
 		 (echo "$progname: Usage error:"
@@ -1262,6 +1262,10 @@

     i[3-9]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;

+    *-*-darwin*)
+    opsys=darwin
+    RANLIB="ranlib -c"     pdump=yes              ;;
+
     i586-dg-dgux*R4*   | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
   m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;;
   m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) opsys=dgux5-4r2 ;;
@@ -1641,7 +1645,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1645: checking for $ac_word" >&5
+echo "configure:1649: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1668,7 +1672,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1672: checking for $ac_word" >&5
+echo "configure:1676: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1716,7 +1720,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1720: checking for $ac_word" >&5
+echo "configure:1724: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1745,7 +1749,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1753: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1758,12 +1762,12 @@

 cat > conftest.$ac_ext << EOF

-#line 1762 "configure"
+#line 1766 "configure"
 #include "confdefs.h"

 main(){return(0);}
 EOF
-if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1791,19 +1795,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1799: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross

 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1800: checking whether we are using GNU C" >&5
+echo "configure:1804: checking whether we are using GNU C" >&5

 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1821,7 +1825,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1825: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1829: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1854,7 +1858,7 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1858: checking for $ac_word" >&5
+echo "configure:1862: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1881,7 +1885,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1885: checking for $ac_word" >&5
+echo "configure:1889: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1929,7 +1933,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1933: checking for $ac_word" >&5
+echo "configure:1937: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1958,7 +1962,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1962: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1966: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1971,12 +1975,12 @@

 cat > conftest.$ac_ext << EOF

-#line 1975 "configure"
+#line 1979 "configure"
 #include "confdefs.h"

 main(){return(0);}
 EOF
-if { (eval echo configure:1980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2004,19 +2008,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2012: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross

 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2013: checking whether we are using GNU C" >&5
+echo "configure:2017: checking whether we are using GNU C" >&5

 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2034,7 +2038,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2038: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2042: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2067,7 +2071,7 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2071: checking for $ac_word" >&5
+echo "configure:2075: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2094,7 +2098,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2098: checking for $ac_word" >&5
+echo "configure:2102: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2142,7 +2146,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2146: checking for $ac_word" >&5
+echo "configure:2150: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2171,7 +2175,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2175: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2179: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -2184,12 +2188,12 @@

 cat > conftest.$ac_ext << EOF

-#line 2188 "configure"
+#line 2192 "configure"
 #include "confdefs.h"

 main(){return(0);}
 EOF
-if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2217,19 +2221,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2221: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2225: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross

 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2226: checking whether we are using GNU C" >&5
+echo "configure:2230: checking whether we are using GNU C" >&5

 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2247,7 +2251,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2251: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2255: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2284,7 +2288,7 @@
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"

 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2288: checking how to run the C preprocessor" >&5
+echo "configure:2292: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2297,13 +2301,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2301 "configure"
+#line 2305 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2314,13 +2318,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2318 "configure"
+#line 2322 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2331,13 +2335,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2335 "configure"
+#line 2339 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2363,9 +2367,9 @@


 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2367: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2369 "configure"
+echo "configure:2371: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2373 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2392,9 +2396,9 @@


 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2396: checking for GNU libc" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2398 "configure"
+echo "configure:2400: checking for GNU libc" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2402 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2406,7 +2410,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:2410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2483,7 +2487,7 @@
 esac

 cat > conftest.$ac_ext <<EOF
-#line 2487 "configure"
+#line 2491 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2497,7 +2501,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2749,17 +2753,17 @@

 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2753: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2757: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2756 "configure"
+#line 2760 "configure"
 #include "confdefs.h"

 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2770,14 +2774,14 @@
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2774 "configure"
+#line 2778 "configure"
 #include "confdefs.h"

 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes
 else
@@ -2815,7 +2819,7 @@

 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2819: checking for buggy gcc versions" >&5
+echo "configure:2823: checking for buggy gcc versions" >&5
 GCC_VERSION=`$CC --version`
 case `uname -s`:`uname -m`:$GCC_VERSION in
 		    *:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
@@ -2873,7 +2877,7 @@

 if test "$pdump" != "yes"; then
   echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:2877: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:2881: checking for \"-z nocombreloc\" linker flag" >&5
   case "`ld --help 2>&1`" in
     *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
       ld_switch_site="-z nocombreloc $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
@@ -2962,7 +2966,7 @@
  fi

 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2966: checking for dynodump" >&5
+echo "configure:2970: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -3000,12 +3004,12 @@
   done

 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3004: checking for terminateAndUnload in -lC" >&5
+echo "configure:3008: checking for terminateAndUnload in -lC" >&5
 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lC "
 cat > conftest.$ac_ext <<EOF
-#line 3009 "configure"
+#line 3013 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3016,7 +3020,7 @@
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:3020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3124,7 +3128,7 @@

 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3128: checking "for runtime libraries flag"" >&5
+echo "configure:3132: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3146,14 +3150,14 @@
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3150 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:3157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 3154 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:3161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3254,10 +3258,10 @@
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3258: checking for malloc_set_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3261 "configure"
+echo "configure:3262: checking for malloc_set_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3265 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3280,7 +3284,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:3284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -3300,16 +3304,16 @@
 fi

 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3304: checking whether __after_morecore_hook exists" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3306 "configure"
+echo "configure:3308: checking whether __after_morecore_hook exists" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3310 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3365,7 +3369,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3369: checking for $ac_word" >&5
+echo "configure:3373: checking for $ac_word" >&5

 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3420,7 +3424,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3424: checking for a BSD compatible install" >&5
+echo "configure:3428: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then

   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3474,7 +3478,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3478: checking for $ac_word" >&5
+echo "configure:3482: checking for $ac_word" >&5

 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3506,15 +3510,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3510: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3513 "configure"
+echo "configure:3514: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3517 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3544,10 +3548,10 @@
 done

 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3548: checking for sys/wait.h that is POSIX.1 compatible" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3551 "configure"
+echo "configure:3552: checking for sys/wait.h that is POSIX.1 compatible" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3555 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3563,7 +3567,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3587,10 +3591,10 @@
 fi

 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3591: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3594 "configure"
+echo "configure:3595: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3598 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3598,7 +3602,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3615,7 +3619,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3619 "configure"
+#line 3623 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3633,7 +3637,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3637 "configure"
+#line 3641 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3651,7 +3655,7 @@
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 3655 "configure"
+#line 3659 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3662,7 +3666,7 @@
 exit (0); }

 EOF
-if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3688,10 +3692,10 @@
 fi

 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3692: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3695 "configure"
+echo "configure:3696: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3699 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3700,7 +3704,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3724,10 +3728,10 @@
 fi

 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3728: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3731 "configure"
+echo "configure:3732: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3735 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3739,7 +3743,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3765,9 +3769,9 @@


 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3769: checking for utime" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3771 "configure"
+echo "configure:3773: checking for utime" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3775 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3775,7 +3779,7 @@
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -3794,10 +3798,10 @@
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3798: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3801 "configure"
+echo "configure:3802: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3805 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3820,7 +3824,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:3824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3852,10 +3856,10 @@


 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3856: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3859 "configure"
+echo "configure:3860: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3863 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3872,7 +3876,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3894,10 +3898,10 @@


 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3898: checking for size_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3901 "configure"
+echo "configure:3902: checking for size_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3905 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3928,10 +3932,10 @@
 fi

 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3932: checking for pid_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3935 "configure"
+echo "configure:3936: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3939 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3962,10 +3966,10 @@
 fi

 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3966: checking for uid_t in sys/types.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3969 "configure"
+echo "configure:3970: checking for uid_t in sys/types.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3973 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4001,10 +4005,10 @@
 fi

 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4005: checking for mode_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4008 "configure"
+echo "configure:4009: checking for mode_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4012 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4035,10 +4039,10 @@
 fi

 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4039: checking for off_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4042 "configure"
+echo "configure:4043: checking for off_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4046 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4069,10 +4073,10 @@
 fi

 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4073: checking for ssize_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4076 "configure"
+echo "configure:4077: checking for ssize_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4080 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4104,9 +4108,9 @@


 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4108: checking for socklen_t" >&5
-cat > conftest.$ac_ext <<EOF
-#line 4110 "configure"
+echo "configure:4112: checking for socklen_t" >&5
+cat > conftest.$ac_ext <<EOF
+#line 4114 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 socklen_t x;
@@ -4115,7 +4119,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4124,7 +4128,7 @@
   rm -rf conftest*

 cat > conftest.$ac_ext <<EOF
-#line 4128 "configure"
+#line 4132 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
@@ -4133,7 +4137,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*

 echo "$ac_t""size_t" 1>&6
@@ -4165,9 +4169,9 @@
 rm -f conftest*

 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4169: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 4171 "configure"
+echo "configure:4173: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 4175 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4183,7 +4187,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4205,10 +4209,10 @@
 rm -f conftest*

 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4209: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4212 "configure"
+echo "configure:4213: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4216 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4216,7 +4220,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4240,10 +4244,10 @@
 fi

 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4244: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4247 "configure"
+echo "configure:4248: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4251 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4251,7 +4255,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4274,10 +4278,10 @@

 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4278: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4281 "configure"
+echo "configure:4282: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4285 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4287,7 +4291,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4313,10 +4317,10 @@


 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4317: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4320 "configure"
+echo "configure:4321: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4324 "configure"
 #include "confdefs.h"

 int main() {
@@ -4365,7 +4369,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4390,7 +4394,7 @@


 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4394: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4398: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`

 cat > conftestmake <<\EOF
@@ -4415,12 +4419,12 @@


 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4419: checking whether byte ordering is bigendian" >&5
+echo "configure:4423: checking whether byte ordering is bigendian" >&5

 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 4424 "configure"
+#line 4428 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4431,11 +4435,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 4439 "configure"
+#line 4443 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4446,7 +4450,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4463,7 +4467,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4467 "configure"
+#line 4471 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4476,7 +4480,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4503,10 +4507,10 @@


 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4507: checking size of short" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4510 "configure"
+echo "configure:4511: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4514 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4517,7 +4521,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4545,10 +4549,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4549: checking size of int" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4552 "configure"
+echo "configure:4553: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4556 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4559,7 +4563,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4581,10 +4585,10 @@


 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4585: checking size of long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4588 "configure"
+echo "configure:4589: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4592 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4595,7 +4599,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4617,10 +4621,10 @@


 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4621: checking size of long long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4624 "configure"
+echo "configure:4625: checking size of long long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4628 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4631,7 +4635,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -4653,10 +4657,10 @@


 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4657: checking size of void *" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4660 "configure"
+echo "configure:4661: checking size of void *" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4664 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4667,7 +4671,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -4690,7 +4694,7 @@


 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4694: checking for long file names" >&5
+echo "configure:4698: checking for long file names" >&5

 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
@@ -4736,10 +4740,10 @@


 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4740: checking for sin" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4743 "configure"
+echo "configure:4744: checking for sin" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4747 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4762,7 +4766,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -4780,12 +4784,12 @@
   echo "$ac_t""no" 1>&6

 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4784: checking for sin in -lm" >&5
+echo "configure:4788: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 4789 "configure"
+#line 4793 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4796,7 +4800,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4840,14 +4844,14 @@


 cat > conftest.$ac_ext <<EOF
-#line 4844 "configure"
+#line 4848 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 return atanh(1.0) + asinh(1.0) + acosh(1.0);
 ; return 0; }
 EOF
-if { (eval echo configure:4851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -4866,10 +4870,10 @@
 for ac_func in mkstemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4870: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4873 "configure"
+echo "configure:4874: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4877 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4892,7 +4896,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4921,14 +4925,14 @@


 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4925: checking type of mail spool file locking" >&5
+echo "configure:4929: checking type of mail spool file locking" >&5
 for ac_func in lockf flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4929: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4932 "configure"
+echo "configure:4933: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4936 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4951,7 +4955,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5033,12 +5037,12 @@
 case "$opsys" in decosf*)

 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5037: checking for cma_open in -lpthreads" >&5
+echo "configure:5041: checking for cma_open in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lpthreads "
 cat > conftest.$ac_ext <<EOF
-#line 5042 "configure"
+#line 5046 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5049,7 +5053,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5086,7 +5090,7 @@


 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5090: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5094: checking whether the -xildoff compiler flag is required" >&5
 if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
   if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
     then echo "$ac_t""no" 1>&6;
@@ -5098,7 +5102,7 @@
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 56; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5102: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5106: checking for \"-z ignore\" linker flag" >&5
     case "`ld -h 2>&1`" in
       *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
         ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
@@ -5109,7 +5113,7 @@


 echo "checking "for specified window system"" 1>&6
-echo "configure:5113: checking "for specified window system"" >&5
+echo "configure:5117: checking "for specified window system"" >&5


 GNOME_CONFIG=no
@@ -5117,7 +5121,7 @@

 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5121: checking for GNOME configuration script" >&5
+echo "configure:5125: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5148,7 +5152,7 @@

 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5152: checking for GTK configuration script" >&5
+echo "configure:5156: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5170,18 +5174,18 @@

 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5174: checking gtk version" >&5
+echo "configure:5178: checking gtk version" >&5
       GTK_VERSION=`${GTK_CONFIG} --version`
       echo "$ac_t""${GTK_VERSION}" 1>&6

       echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5179: checking gtk libs" >&5
+echo "configure:5183: checking gtk libs" >&5
       GTK_LIBS=`${GTK_CONFIG} --libs`
       libs_gtk="$libs_gtk ${GTK_LIBS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
       echo "$ac_t""${GTK_LIBS}" 1>&6

       echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5185: checking gtk cflags" >&5
+echo "configure:5189: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5191,19 +5195,19 @@


 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5195: checking for main in -lgdk_imlib" >&5
+echo "configure:5199: checking for main in -lgdk_imlib" >&5
 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgdk_imlib "
 cat > conftest.$ac_ext <<EOF
-#line 5200 "configure"
+#line 5204 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5225,12 +5229,12 @@


 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5229: checking for Imlib_init in -lImlib" >&5
+echo "configure:5233: checking for Imlib_init in -lImlib" >&5
 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lImlib "
 cat > conftest.$ac_ext <<EOF
-#line 5234 "configure"
+#line 5238 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5241,7 +5245,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5264,10 +5268,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5268: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5271 "configure"
+echo "configure:5272: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5290,7 +5294,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:5294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5356,15 +5360,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5360: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5363 "configure"
+echo "configure:5364: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5367 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5395,19 +5399,19 @@


 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5399: checking for main in -lxml" >&5
+echo "configure:5403: checking for main in -lxml" >&5
 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lxml "
 cat > conftest.$ac_ext <<EOF
-#line 5404 "configure"
+#line 5408 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5429,19 +5433,19 @@


 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5433: checking for main in -lglade" >&5
+echo "configure:5437: checking for main in -lglade" >&5
 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lglade "
 cat > conftest.$ac_ext <<EOF
-#line 5438 "configure"
+#line 5442 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5463,19 +5467,19 @@


 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5467: checking for main in -lglade-gnome" >&5
+echo "configure:5471: checking for main in -lglade-gnome" >&5
 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lglade-gnome "
 cat > conftest.$ac_ext <<EOF
-#line 5472 "configure"
+#line 5476 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5496,7 +5500,7 @@


       cat > conftest.$ac_ext <<EOF
-#line 5500 "configure"
+#line 5504 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5555,7 +5559,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5559: checking for X" >&5
+echo "configure:5563: checking for X" >&5

 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5615,12 +5619,12 @@

   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5619 "configure"
+#line 5623 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5689,14 +5693,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5693 "configure"
+#line 5697 "configure"
 #include "confdefs.h"

 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -5805,17 +5809,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:5809: checking whether -R must be followed by a space" >&5
+echo "configure:5813: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 5812 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 5816 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:5823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5831,14 +5835,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5835 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 5839 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:5846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5874,12 +5878,12 @@
 else

 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5878: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5882: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldnet "
 cat > conftest.$ac_ext <<EOF
-#line 5883 "configure"
+#line 5887 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5890,7 +5894,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5914,12 +5918,12 @@
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:5918: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5922: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldnet_stub "
 cat > conftest.$ac_ext <<EOF
-#line 5923 "configure"
+#line 5927 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5930,7 +5934,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5959,10 +5963,10 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:5963: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5966 "configure"
+echo "configure:5967: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5970 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5985,7 +5989,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -6006,12 +6010,12 @@
     if test $ac_cv_func_gethostbyname = no; then

 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6010: checking for gethostbyname in -lnsl" >&5
+echo "configure:6014: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lnsl "
 cat > conftest.$ac_ext <<EOF
-#line 6015 "configure"
+#line 6019 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6022,7 +6026,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6052,10 +6056,10 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:6056: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6059 "configure"
+echo "configure:6060: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6063 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6078,7 +6082,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -6101,12 +6105,12 @@
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6105: checking "$xe_msg_checking"" >&5
+echo "configure:6109: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lsocket $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6110 "configure"
+#line 6114 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6117,7 +6121,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6141,10 +6145,10 @@

     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6145: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6148 "configure"
+echo "configure:6149: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6152 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6167,7 +6171,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -6188,12 +6192,12 @@
     if test $ac_cv_func_remove = no; then

 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6192: checking for remove in -lposix" >&5
+echo "configure:6196: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lposix "
 cat > conftest.$ac_ext <<EOF
-#line 6197 "configure"
+#line 6201 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6204,7 +6208,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6228,10 +6232,10 @@

     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6232: checking for shmat" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6235 "configure"
+echo "configure:6236: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6239 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6254,7 +6258,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -6275,12 +6279,12 @@
     if test $ac_cv_func_shmat = no; then

 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6279: checking for shmat in -lipc" >&5
+echo "configure:6283: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lipc "
 cat > conftest.$ac_ext <<EOF
-#line 6284 "configure"
+#line 6288 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6291,7 +6295,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6327,12 +6331,12 @@
 xe_msg_checking="for IceConnectionNumber in -lICE"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6331: checking "$xe_msg_checking"" >&5
+echo "configure:6335: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lICE $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6336 "configure"
+#line 6340 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6343,7 +6347,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6510,7 +6514,7 @@


     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6514: checking for X defines extracted by xmkmf" >&5
+echo "configure:6518: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6559,15 +6563,15 @@

     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6563: checking for X11/Intrinsic.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6566 "configure"
+echo "configure:6567: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6570 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6591,12 +6595,12 @@


 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6595: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6599: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 6600 "configure"
+#line 6604 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6607,7 +6611,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6632,12 +6636,12 @@
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6636: checking "$xe_msg_checking"" >&5
+echo "configure:6640: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lX11 -b i486-linuxaout"
 cat > conftest.$ac_ext <<EOF
-#line 6641 "configure"
+#line 6645 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6648,7 +6652,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6675,12 +6679,12 @@


 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6679: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6683: checking for XShapeSelectInput in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXext "
 cat > conftest.$ac_ext <<EOF
-#line 6684 "configure"
+#line 6688 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6691,7 +6695,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6714,12 +6718,12 @@


 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6718: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6722: checking for XtOpenDisplay in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXt "
 cat > conftest.$ac_ext <<EOF
-#line 6723 "configure"
+#line 6727 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6730,7 +6734,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6753,14 +6757,14 @@


   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6757: checking the version of X11 being used" >&5
+echo "configure:6761: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6759 "configure"
+#line 6763 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6791,10 +6795,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6795: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6798 "configure"
+echo "configure:6799: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6802 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6817,7 +6821,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6849,15 +6853,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6853: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6856 "configure"
+echo "configure:6857: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6860 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6890,10 +6894,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6894: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6897 "configure"
+echo "configure:6898: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6901 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6916,7 +6920,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6944,9 +6948,9 @@
 done

   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6948: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6952: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6950 "configure"
+#line 6954 "configure"
 #include "confdefs.h"

 #define NeedFunctionPrototypes 1
@@ -6958,7 +6962,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6979,12 +6983,12 @@

     test -z "$with_xmu" && {
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6983: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6987: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 6988 "configure"
+#line 6992 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6995,7 +6999,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:6999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7034,19 +7038,19 @@


 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7038: checking for main in -lXbsd" >&5
+echo "configure:7042: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXbsd "
 cat > conftest.$ac_ext <<EOF
-#line 7043 "configure"
+#line 7047 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7083,22 +7087,22 @@
 fi
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7087: checking for MS-Windows" >&5
+echo "configure:7091: checking for MS-Windows" >&5

 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7090: checking for main in -lgdi32" >&5
+echo "configure:7094: checking for main in -lgdi32" >&5
 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgdi32 "
 cat > conftest.$ac_ext <<EOF
-#line 7095 "configure"
+#line 7099 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7149,12 +7153,12 @@
       test "$with_widgets"    != "no" && with_widgets=msw
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7153 "configure"
+#line 7157 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7215,15 +7219,15 @@
 if test "$with_x11" = "yes"; then
   ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7219: checking for X11/extensions/shape.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7222 "configure"
+echo "configure:7223: checking for X11/extensions/shape.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7226 "configure"
 #include "confdefs.h"
 #include <X11/extensions/shape.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7273,7 +7277,7 @@
 esac

 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7277: checking for WM_COMMAND option" >&5;
+echo "configure:7281: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7288,15 +7292,15 @@
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7292: checking for X11/Xauth.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7295 "configure"
+echo "configure:7296: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7299 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7319,12 +7323,12 @@
  }
 test -z "$with_xauth" && {
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7323: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7327: checking for XauGetAuthByAddr in -lXau" >&5
 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF
-#line 7328 "configure"
+#line 7332 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7335,7 +7339,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7380,15 +7384,15 @@
       for dir in "" "Tt/" "desktop/" ; do
     ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:7384: checking for ${dir}tt_c.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7387 "configure"
+echo "configure:7388: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7391 "configure"
 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7424,12 +7428,12 @@
 xe_msg_checking="for tt_message_create in -ltt"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7428: checking "$xe_msg_checking"" >&5
+echo "configure:7432: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ltt $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 7433 "configure"
+#line 7437 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7440,7 +7444,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7494,15 +7498,15 @@

 test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:7498: checking for Dt/Dt.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7501 "configure"
+echo "configure:7502: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7505 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7525,12 +7529,12 @@
  }
 test -z "$with_cde" && {
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7529: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7533: checking for DtDndDragStart in -lDtSvc" >&5
 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF
-#line 7534 "configure"
+#line 7538 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7541,7 +7545,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7622,7 +7626,7 @@

 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7626: checking if drag and drop API is needed" >&5
+echo "configure:7630: checking if drag and drop API is needed" >&5
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes
     echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
@@ -7642,18 +7646,18 @@
 fi

 echo "checking for LDAP" 1>&6
-echo "configure:7646: checking for LDAP" >&5
+echo "configure:7650: checking for LDAP" >&5
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:7649: checking for ldap.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7652 "configure"
+echo "configure:7653: checking for ldap.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7656 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7676,15 +7680,15 @@
  }
 test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:7680: checking for lber.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7683 "configure"
+echo "configure:7684: checking for lber.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7687 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7708,12 +7712,12 @@
 if test "$with_ldap" != "no"; then

 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7712: checking for ldap_search in -lldap" >&5
+echo "configure:7716: checking for ldap_search in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 7717 "configure"
+#line 7721 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7724,7 +7728,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7749,12 +7753,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7753: checking "$xe_msg_checking"" >&5
+echo "configure:7757: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF
-#line 7758 "configure"
+#line 7762 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7765,7 +7769,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7790,12 +7794,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7794: checking "$xe_msg_checking"" >&5
+echo "configure:7798: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lldap -llber -lkrb"
 cat > conftest.$ac_ext <<EOF
-#line 7799 "configure"
+#line 7803 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7806,7 +7810,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7831,12 +7835,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7835: checking "$xe_msg_checking"" >&5
+echo "configure:7839: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lldap -llber -lkrb -ldes"
 cat > conftest.$ac_ext <<EOF
-#line 7840 "configure"
+#line 7844 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7847,7 +7851,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7895,10 +7899,10 @@
   for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7899: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7902 "configure"
+echo "configure:7903: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7906 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7921,7 +7925,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7952,20 +7956,20 @@

 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:7956: checking for PostgreSQL" >&5
+echo "configure:7960: checking for PostgreSQL" >&5

   for header_dir in "" "pgsql/" "postgresql/"; do
     ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:7961: checking for ${header_dir}libpq-fe.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7964 "configure"
+echo "configure:7965: checking for ${header_dir}libpq-fe.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7968 "configure"
 #include "confdefs.h"
 #include <${header_dir}libpq-fe.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7989,12 +7993,12 @@

   test -n "$libpq_fe_h_file" && {
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:7993: checking for PQconnectdb in -lpq" >&5
+echo "configure:7997: checking for PQconnectdb in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 7998 "configure"
+#line 8002 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8005,7 +8009,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8038,12 +8042,12 @@


 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:8042: checking for PQconnectStart in -lpq" >&5
+echo "configure:8046: checking for PQconnectStart in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 8047 "configure"
+#line 8051 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8054,7 +8058,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8099,7 +8103,7 @@

 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8103: checking for graphics libraries" >&5
+echo "configure:8107: checking for graphics libraries" >&5

       libpath_xpm=
   incpath_xpm=
@@ -8125,10 +8129,10 @@
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:8129: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8133: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8132 "configure"
+#line 8136 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8137,7 +8141,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; xpm_status=$?;
       if test "$xpm_status" = "0"; then
@@ -8181,17 +8185,17 @@
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:8185: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8189: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8188 "configure"
+#line 8192 "configure"
 #include "confdefs.h"

 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8217,15 +8221,15 @@

     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8221: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8224 "configure"
+echo "configure:8225: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8228 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8248,12 +8252,12 @@
  }
   test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8252: checking for UnGenFace in -lcompface" >&5
+echo "configure:8256: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 8257 "configure"
+#line 8261 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8264,7 +8268,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8313,12 +8317,12 @@
       if test "$with_png $with_tiff" != "no no"; then

 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8317: checking for inflate in -lc" >&5
+echo "configure:8321: checking for inflate in -lc" >&5
 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 8322 "configure"
+#line 8326 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8329,7 +8333,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8348,12 +8352,12 @@
   echo "$ac_t""no" 1>&6

 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8352: checking for inflate in -lz" >&5
+echo "configure:8356: checking for inflate in -lz" >&5
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
-#line 8357 "configure"
+#line 8361 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8364,7 +8368,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8383,12 +8387,12 @@
   echo "$ac_t""no" 1>&6

 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8387: checking for inflate in -lgz" >&5
+echo "configure:8391: checking for inflate in -lgz" >&5
 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
-#line 8392 "configure"
+#line 8396 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8399,7 +8403,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8429,15 +8433,15 @@

     test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:8433: checking for jpeglib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8436 "configure"
+echo "configure:8437: checking for jpeglib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8440 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8460,12 +8464,12 @@
  }
   test -z "$with_jpeg" && {
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8464: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8468: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 8469 "configure"
+#line 8473 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8476,7 +8480,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8512,10 +8516,10 @@

     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8516: checking for pow" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8519 "configure"
+echo "configure:8520: checking for pow" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8523 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8538,7 +8542,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:8542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -8559,15 +8563,15 @@
  }
   test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:8563: checking for png.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8566 "configure"
+echo "configure:8567: checking for png.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8570 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8590,12 +8594,12 @@
  }
   test -z "$with_png" && {
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8594: checking for png_read_image in -lpng" >&5
+echo "configure:8598: checking for png_read_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF
-#line 8599 "configure"
+#line 8603 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8606,7 +8610,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8629,10 +8633,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8633: checking for workable png version information" >&5
+echo "configure:8637: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8636 "configure"
+#line 8640 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8640,7 +8644,7 @@
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; png_status=$?;
       if test "$png_status" = "0"; then
@@ -8683,15 +8687,15 @@

     test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:8687: checking for tiffio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8690 "configure"
+echo "configure:8691: checking for tiffio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8694 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8714,12 +8718,12 @@
  }
   test -z "$with_tiff" && {
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8718: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8722: checking for TIFFClientOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF
-#line 8723 "configure"
+#line 8727 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8730,7 +8734,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8769,15 +8773,15 @@
 if test "$with_gtk" = "yes"; then
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8773: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8776 "configure"
+echo "configure:8777: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8780 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8800,12 +8804,12 @@
  }
   test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8804: checking for UnGenFace in -lcompface" >&5
+echo "configure:8808: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 8809 "configure"
+#line 8813 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8816,7 +8820,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8855,7 +8859,7 @@

 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8859: checking for X11 graphics libraries" >&5
+echo "configure:8863: checking for X11 graphics libraries" >&5
 fi

 case "$with_widgets" in
@@ -8865,7 +8869,7 @@

 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:8869: checking for the Athena widgets" >&5
+echo "configure:8873: checking for the Athena widgets" >&5

     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -8879,12 +8883,12 @@
     if test "$athena_3d" = "no"; then

 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8883: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8887: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`

 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8888 "configure"
+#line 8892 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8895,7 +8899,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:8899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8911,12 +8915,12 @@
   echo "$ac_t""yes" 1>&6

 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8915: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8919: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`

 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8920 "configure"
+#line 8924 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8927,7 +8931,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8958,12 +8962,12 @@
   else

 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8962: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8966: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`

 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8967 "configure"
+#line 8971 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8974,7 +8978,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8992,12 +8996,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8996: checking for threeDClassRec in -lXaw" >&5
+echo "configure:9000: checking for threeDClassRec in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 9001 "configure"
+#line 9005 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9008,7 +9012,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9039,15 +9043,15 @@
     if test "$athena_3d" = "no"; then
     ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9043: checking for X11/Xaw/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9046 "configure"
+echo "configure:9047: checking for X11/Xaw/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9050 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9067,15 +9071,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:9071: checking for X11/Xaw/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9074 "configure"
+echo "configure:9075: checking for X11/Xaw/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9078 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9101,15 +9105,15 @@
   else
             ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9105: checking for X11/$athena_variant/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9108 "configure"
+echo "configure:9109: checking for X11/$athena_variant/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9112 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9126,15 +9130,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9130: checking for X11/$athena_variant/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9133 "configure"
+echo "configure:9134: checking for X11/$athena_variant/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9137 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9162,15 +9166,15 @@
         if test -z "$athena_h_path"; then
       ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9166: checking for $athena_variant/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9169 "configure"
+echo "configure:9170: checking for $athena_variant/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9173 "configure"
 #include "confdefs.h"
 #include <$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9187,15 +9191,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9191: checking for $athena_variant/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9194 "configure"
+echo "configure:9195: checking for $athena_variant/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9198 "configure"
 #include "confdefs.h"
 #include <$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9224,15 +9228,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9228: checking for X11/Xaw3d/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9231 "configure"
+echo "configure:9232: checking for X11/Xaw3d/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9235 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9249,15 +9253,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9253: checking for X11/Xaw3d/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9256 "configure"
+echo "configure:9257: checking for X11/Xaw3d/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9260 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9289,15 +9293,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9293: checking for Xaw3d/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9296 "configure"
+echo "configure:9297: checking for Xaw3d/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9300 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9314,15 +9318,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9318: checking for Xaw3d/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9321 "configure"
+echo "configure:9322: checking for Xaw3d/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9325 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9354,15 +9358,15 @@
             if test -z "$athena_h_path"; then
       ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9358: checking for X11/Xaw/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9361 "configure"
+echo "configure:9362: checking for X11/Xaw/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9365 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9401,15 +9405,15 @@
 if test "$with_x11" = "yes"; then
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9405: checking for Xm/Xm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9408 "configure"
+echo "configure:9409: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9412 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9426,12 +9430,12 @@
   echo "$ac_t""yes" 1>&6

 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9430: checking for XmStringFree in -lXm" >&5
+echo "configure:9434: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 9435 "configure"
+#line 9439 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9442,7 +9446,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9471,9 +9475,9 @@

   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9475: checking for Lesstif" >&5
+echo "configure:9479: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9477 "configure"
+#line 9481 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9846,7 +9850,7 @@

 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:9850: checking for Mule-related features" >&5
+echo "configure:9854: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -9860,15 +9864,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9864: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9867 "configure"
+echo "configure:9868: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9871 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9899,12 +9903,12 @@


 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9903: checking for strerror in -lintl" >&5
+echo "configure:9907: checking for strerror in -lintl" >&5
 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF
-#line 9908 "configure"
+#line 9912 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9915,7 +9919,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:9919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9948,18 +9952,18 @@


   echo "checking for Mule input methods" 1>&6
-echo "configure:9952: checking for Mule input methods" >&5
+echo "configure:9956: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:9955: checking for XIM" >&5
+echo "configure:9959: checking for XIM" >&5

 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9958: checking for XOpenIM in -lX11" >&5
+echo "configure:9962: checking for XOpenIM in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 9963 "configure"
+#line 9967 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9970,7 +9974,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9994,12 +9998,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then

 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:9998: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10002: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 10003 "configure"
+#line 10007 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10010,7 +10014,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10075,15 +10079,15 @@

     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10079: checking for XFontSet" >&5
+echo "configure:10083: checking for XFontSet" >&5

 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10082: checking for XmbDrawString in -lX11" >&5
+echo "configure:10086: checking for XmbDrawString in -lX11" >&5
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 10087 "configure"
+#line 10091 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10094,7 +10098,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10134,15 +10138,15 @@
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:10138: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10141 "configure"
+echo "configure:10142: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10145 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10165,15 +10169,15 @@
  }
     test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:10169: checking for wnn/commonhd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10172 "configure"
+echo "configure:10173: checking for wnn/commonhd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10176 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10198,10 +10202,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10202: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10205 "configure"
+echo "configure:10206: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10209 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10224,7 +10228,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:10228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10253,12 +10257,12 @@

     test "$ac_cv_func_crypt" != "yes" && {
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10257: checking for crypt in -lcrypt" >&5
+echo "configure:10261: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
-#line 10262 "configure"
+#line 10266 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10269,7 +10273,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10304,12 +10308,12 @@
     if test -z "$with_wnn" -o "$with_wnn" = "yes"; then

 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:10308: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10312: checking for jl_dic_list_e in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 10313 "configure"
+#line 10317 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10320,7 +10324,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10338,12 +10342,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:10342: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10346: checking for jl_dic_list_e in -lwnn4" >&5
 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lwnn4 "
 cat > conftest.$ac_ext <<EOF
-#line 10347 "configure"
+#line 10351 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10354,7 +10358,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10372,12 +10376,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:10376: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10380: checking for jl_dic_list_e in -lwnn6" >&5
 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lwnn6 "
 cat > conftest.$ac_ext <<EOF
-#line 10381 "configure"
+#line 10385 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10388,7 +10392,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10406,12 +10410,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:10410: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10414: checking for dic_list_e in -lwnn6_fromsrc" >&5
 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lwnn6_fromsrc "
 cat > conftest.$ac_ext <<EOF
-#line 10415 "configure"
+#line 10419 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10422,7 +10426,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10467,12 +10471,12 @@
     if test "$with_wnn6" != "no"; then

 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:10471: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10475: checking for jl_fi_dic_list in -l$libwnn" >&5
 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`

 xe_check_libs=" -l$libwnn "
 cat > conftest.$ac_ext <<EOF
-#line 10476 "configure"
+#line 10480 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10483,7 +10487,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10518,15 +10522,15 @@
   if test "$with_canna" != "no"; then
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10522: checking for canna/jrkanji.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10525 "configure"
+echo "configure:10526: checking for canna/jrkanji.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10529 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10553,15 +10557,15 @@
     c_switch_site="$c_switch_site -I/usr/local/canna/include"
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10557: checking for canna/jrkanji.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10560 "configure"
+echo "configure:10561: checking for canna/jrkanji.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10564 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10589,15 +10593,15 @@

   test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:10593: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10596 "configure"
+echo "configure:10597: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10600 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10620,12 +10624,12 @@
  }
   test -z "$with_canna" && {
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10624: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10628: checking for RkBgnBun in -lRKC" >&5
 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF
-#line 10629 "configure"
+#line 10633 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10636,7 +10640,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10659,12 +10663,12 @@
  }
   test -z "$with_canna" && {
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10663: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10667: checking for jrKanjiControl in -lcanna" >&5
 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF
-#line 10668 "configure"
+#line 10672 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10675,7 +10679,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10721,12 +10725,12 @@
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi

 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:10725: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10729: checking for layout_object_getvalue in -li18n" >&5
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`

 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF
-#line 10730 "configure"
+#line 10734 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10737,7 +10741,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10823,10 +10827,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10827: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10830 "configure"
+echo "configure:10831: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10834 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10849,7 +10853,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:10853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10881,10 +10885,10 @@
 for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10885: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10888 "configure"
+echo "configure:10889: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10892 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10907,7 +10911,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:10911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10936,10 +10940,10 @@


 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10940: checking for openpty" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10943 "configure"
+echo "configure:10944: checking for openpty" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10947 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -10962,7 +10966,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:10966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_openpty=yes"
 else
@@ -10981,12 +10985,12 @@


 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10985: checking for openpty in -lutil" >&5
+echo "configure:10989: checking for openpty in -lutil" >&5
 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lutil "
 cat > conftest.$ac_ext <<EOF
-#line 10990 "configure"
+#line 10994 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10997,7 +11001,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11032,15 +11036,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11036: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11039 "configure"
+echo "configure:11040: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11043 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11077,15 +11081,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11081: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11084 "configure"
+echo "configure:11085: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11088 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11118,15 +11122,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11122: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11125 "configure"
+echo "configure:11126: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11129 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11159,15 +11163,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11163: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11166 "configure"
+echo "configure:11167: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11170 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11203,15 +11207,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11207: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11210 "configure"
+echo "configure:11211: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11214 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11244,10 +11248,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11248: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11251 "configure"
+echo "configure:11252: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11255 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11270,7 +11274,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:11274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11301,15 +11305,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11305: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11308 "configure"
+echo "configure:11309: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11312 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11342,10 +11346,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11346: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11349 "configure"
+echo "configure:11350: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11353 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11368,7 +11372,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:11372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11401,15 +11405,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11405: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11408 "configure"
+echo "configure:11409: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11412 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11445,12 +11449,12 @@


 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11449: checking for kstat_open in -lkstat" >&5
+echo "configure:11453: checking for kstat_open in -lkstat" >&5
 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lkstat "
 cat > conftest.$ac_ext <<EOF
-#line 11454 "configure"
+#line 11458 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11461,7 +11465,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11496,15 +11500,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11500: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11503 "configure"
+echo "configure:11504: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11507 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11536,12 +11540,12 @@


 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11540: checking for kvm_read in -lkvm" >&5
+echo "configure:11544: checking for kvm_read in -lkvm" >&5
 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lkvm "
 cat > conftest.$ac_ext <<EOF
-#line 11545 "configure"
+#line 11549 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11552,7 +11556,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11586,16 +11590,16 @@
 fi

 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11590: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 11592 "configure"
+echo "configure:11594: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 11596 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -11615,16 +11619,16 @@
 rm -f conftest*

 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11619: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 11621 "configure"
+echo "configure:11623: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 11625 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -11644,11 +11648,11 @@
 rm -f conftest*

 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11648: checking whether localtime caches TZ" >&5
+echo "configure:11652: checking whether localtime caches TZ" >&5

 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11652 "configure"
+#line 11656 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -11683,7 +11687,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:11687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -11713,9 +11717,9 @@

 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11717: checking whether gettimeofday accepts one or two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 11719 "configure"
+echo "configure:11721: checking whether gettimeofday accepts one or two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 11723 "configure"
 #include "confdefs.h"

 #ifdef TIME_WITH_SYS_TIME
@@ -11736,7 +11740,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:11740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
@@ -11758,19 +11762,19 @@


 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11762: checking for inline" >&5
+echo "configure:11766: checking for inline" >&5

 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11767 "configure"
+#line 11771 "configure"
 #include "confdefs.h"

 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11811,17 +11815,17 @@
   # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:11815: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11818 "configure"
+echo "configure:11819: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11822 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -11845,10 +11849,10 @@
 fi

 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11849: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11852 "configure"
+echo "configure:11853: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11856 "configure"
 #include "confdefs.h"

 #ifdef __GNUC__
@@ -11876,7 +11880,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:11880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -11915,10 +11919,10 @@


 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11919: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11922 "configure"
+echo "configure:11923: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11926 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -11942,10 +11946,10 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11946: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11949 "configure"
+echo "configure:11950: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11953 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11968,7 +11972,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:11972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11998,10 +12002,10 @@
 fi

 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12002: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12005 "configure"
+echo "configure:12006: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12009 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -12020,7 +12024,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:12024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -12049,10 +12053,10 @@
 fi

 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12053: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12056 "configure"
+echo "configure:12057: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12060 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12062,7 +12066,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12090,10 +12094,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12094: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12097 "configure"
+echo "configure:12098: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12101 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12116,7 +12120,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:12120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12144,10 +12148,10 @@
 done

 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12148: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12151 "configure"
+echo "configure:12152: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12155 "configure"
 #include "confdefs.h"

 /*
@@ -12202,7 +12206,7 @@
 }

 EOF
-if { (eval echo configure:12206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12229,10 +12233,10 @@


 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12233: checking for working mmap" >&5
+echo "configure:12237: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12236 "configure"
+#line 12240 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12265,7 +12269,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:12269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12294,9 +12298,9 @@
 if test "$rel_alloc $have_mmap" = "default yes"; then
   if test "$doug_lea_malloc" = "yes"; then
         echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:12298: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12302: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12300 "configure"
+#line 12304 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12308,7 +12312,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:12312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12333,15 +12337,15 @@

 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12337: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12340 "configure"
+echo "configure:12341: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12344 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12384,15 +12388,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:12388: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12391 "configure"
+echo "configure:12392: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12395 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12424,10 +12428,10 @@


 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12428: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12431 "configure"
+echo "configure:12432: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12435 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12450,7 +12454,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:12454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -12465,15 +12469,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:12469: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12472 "configure"
+echo "configure:12473: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12476 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12490,15 +12494,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:12494: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12497 "configure"
+echo "configure:12498: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12501 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12523,9 +12527,9 @@
 }

       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12527: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12531: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12529 "configure"
+#line 12533 "configure"
 #include "confdefs.h"

 #include <sys/types.h>
@@ -12536,7 +12540,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:12540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -12554,9 +12558,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12558: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12562: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12560 "configure"
+#line 12564 "configure"
 #include "confdefs.h"

 #include <sys/types.h>
@@ -12566,7 +12570,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:12570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST
@@ -12597,10 +12601,10 @@


 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12601: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12604 "configure"
+echo "configure:12605: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12608 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12623,7 +12627,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:12627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -12638,15 +12642,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:12642: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12645 "configure"
+echo "configure:12646: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12649 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12663,15 +12667,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:12667: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12670 "configure"
+echo "configure:12671: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12674 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12709,15 +12713,15 @@

 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12713: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12716 "configure"
+echo "configure:12717: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12720 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12744,15 +12748,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:12748: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12751 "configure"
+echo "configure:12752: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12755 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12785,15 +12789,15 @@

 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12789: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12792 "configure"
+echo "configure:12793: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12796 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12823,22 +12827,22 @@


 echo "checking "for sound support"" 1>&6
-echo "configure:12827: checking "for sound support"" >&5
+echo "configure:12831: checking "for sound support"" >&5
 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes

 if test "$with_native_sound" != "no"; then
     if test -n "$native_sound_lib"; then
     ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:12834: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12837 "configure"
+echo "configure:12838: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12841 "configure"
 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12886,12 +12890,12 @@
       if test -z "$native_sound_lib"; then

 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12890: checking for ALopenport in -laudio" >&5
+echo "configure:12894: checking for ALopenport in -laudio" >&5
 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`

 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 12895 "configure"
+#line 12899 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12902,7 +12906,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:12906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12933,12 +12937,12 @@
       if test -z "$native_sound_lib"; then

 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:12937: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12941: checking for AOpenAudio in -lAlib" >&5
 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF
-#line 12942 "configure"
+#line 12946 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12949,7 +12953,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:12953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12997,15 +13001,15 @@
     for dir in "machine" "sys" "linux"; do
       ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:13001: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13004 "configure"
+echo "configure:13005: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13008 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13059,15 +13063,15 @@
 if test "$with_nas_sound" != "no"; then
   ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:13063: checking for audio/audiolib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13066 "configure"
+echo "configure:13067: checking for audio/audiolib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13070 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13085,12 +13089,12 @@


 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13089: checking for AuOpenServer in -laudio" >&5
+echo "configure:13093: checking for AuOpenServer in -laudio" >&5
 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`

 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 13094 "configure"
+#line 13098 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13101,7 +13105,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13140,7 +13144,7 @@
  fi
     libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
             cat > conftest.$ac_ext <<EOF
-#line 13144 "configure"
+#line 13148 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13171,7 +13175,7 @@
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13175: checking for $ac_word" >&5
+echo "configure:13179: checking for $ac_word" >&5

 if test -n "$have_esd_config"; then
   ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
@@ -13200,10 +13204,10 @@
     c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
     LIBS="`esd-config --libs` $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
     echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:13204: checking for esd_play_stream" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13207 "configure"
+echo "configure:13208: checking for esd_play_stream" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13226,7 +13230,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:13230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_esd_play_stream=yes"
 else
@@ -13277,7 +13281,7 @@

 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13281: checking for TTY-related features" >&5
+echo "configure:13285: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13290,12 +13294,12 @@
     if test -z "$with_ncurses"; then

 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13294: checking for tgetent in -lncurses" >&5
+echo "configure:13298: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF
-#line 13299 "configure"
+#line 13303 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13306,7 +13310,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13339,15 +13343,15 @@

     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13343: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13346 "configure"
+echo "configure:13347: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13350 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13369,15 +13373,15 @@

     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13373: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13376 "configure"
+echo "configure:13377: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13380 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13407,15 +13411,15 @@
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13411: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13414 "configure"
+echo "configure:13415: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13418 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13450,12 +13454,12 @@
 	for lib in curses termlib termcap; do

 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13454: checking for tgetent in -l$lib" >&5
+echo "configure:13458: checking for tgetent in -l$lib" >&5
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`

 xe_check_libs=" -l$lib "
 cat > conftest.$ac_ext <<EOF
-#line 13459 "configure"
+#line 13463 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13466,7 +13470,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13497,12 +13501,12 @@
       else

 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13501: checking for tgetent in -lcurses" >&5
+echo "configure:13505: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
-#line 13506 "configure"
+#line 13510 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13513,7 +13517,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13531,12 +13535,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:13535: checking for tgetent in -ltermcap" >&5
+echo "configure:13539: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 13540 "configure"
+#line 13544 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13547,7 +13551,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13595,15 +13599,15 @@

     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:13599: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13602 "configure"
+echo "configure:13603: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13606 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13626,12 +13630,12 @@
  }
   test -z "$with_gpm" && {
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13630: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13634: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgpm "
 cat > conftest.$ac_ext <<EOF
-#line 13635 "configure"
+#line 13639 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13642,7 +13646,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:13646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13685,20 +13689,20 @@

 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13689: checking for database support" >&5
+echo "configure:13693: checking for database support" >&5

 if test "$with_database_gdbm $with_database_dbm" != "no no"; then
   ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:13694: checking for ndbm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13697 "configure"
+echo "configure:13698: checking for ndbm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13701 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13728,12 +13732,12 @@
 if test "$with_database_gdbm" != "no"; then

 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13732: checking for dbm_open in -lgdbm" >&5
+echo "configure:13736: checking for dbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgdbm "
 cat > conftest.$ac_ext <<EOF
-#line 13737 "configure"
+#line 13741 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13744,7 +13748,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13772,10 +13776,10 @@

 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13776: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13779 "configure"
+echo "configure:13780: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13783 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -13798,7 +13802,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:13802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -13817,12 +13821,12 @@


 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13821: checking for dbm_open in -ldbm" >&5
+echo "configure:13825: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldbm "
 cat > conftest.$ac_ext <<EOF
-#line 13826 "configure"
+#line 13830 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13833,7 +13837,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13874,10 +13878,10 @@

 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13878: checking for Berkeley db.h" >&5
+echo "configure:13882: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 13881 "configure"
+#line 13885 "configure"
 #include "confdefs.h"

 #include <stdlib.h>
@@ -13899,7 +13903,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:13903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -13915,9 +13919,9 @@

   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13919: checking for Berkeley DB version" >&5
+echo "configure:13923: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13921 "configure"
+#line 13925 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -13929,7 +13933,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 13933 "configure"
+#line 13937 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -13956,10 +13960,10 @@
 rm -f conftest*

     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:13960: checking for $dbfunc" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13963 "configure"
+echo "configure:13964: checking for $dbfunc" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13967 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -13982,7 +13986,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:13986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else
@@ -14001,12 +14005,12 @@


 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14005: checking for $dbfunc in -ldb" >&5
+echo "configure:14009: checking for $dbfunc in -ldb" >&5
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 14010 "configure"
+#line 14014 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14017,7 +14021,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14078,12 +14082,12 @@
 if test "$with_socks" = "yes"; then

 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14082: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14086: checking for SOCKSinit in -lsocks" >&5
 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF
-#line 14087 "configure"
+#line 14091 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14094,7 +14098,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14149,22 +14153,22 @@

 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14153: checking for module support" >&5
+echo "configure:14157: checking for module support" >&5

     if test "$with_msw" = "yes"; then
     have_dl=yes;
   else
         ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14160: checking for dlfcn.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14163 "configure"
+echo "configure:14164: checking for dlfcn.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14167 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14181,16 +14185,16 @@
   echo "$ac_t""yes" 1>&6

       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14185: checking for dlopen in -lc" >&5
+echo "configure:14189: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 14187 "configure"
+#line 14191 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes
 else
@@ -14199,18 +14203,18 @@
   rm -rf conftest*

       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14203: checking for dlopen in -ldl" >&5
+echo "configure:14207: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 14207 "configure"
+#line 14211 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes
 else
@@ -14239,12 +14243,12 @@
     else

 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14243: checking for shl_load in -ldld" >&5
+echo "configure:14247: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 14248 "configure"
+#line 14252 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14255,7 +14259,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14282,12 +14286,12 @@
   echo "$ac_t""no" 1>&6

 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14286: checking for dld_init in -ldld" >&5
+echo "configure:14290: checking for dld_init in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 14291 "configure"
+#line 14295 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14298,7 +14302,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14343,7 +14347,7 @@
 xealias=$internal_configuration

 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14347: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14351: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14371,9 +14375,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14375: checking checking whether we are using GNU C" >&5
+echo "configure:14379: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14377 "configure"
+#line 14381 "configure"
 #include "confdefs.h"

 #ifdef __GNUC__
@@ -14395,7 +14399,7 @@
 fi

 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14399: checking how to produce PIC code" >&5
+echo "configure:14403: checking how to produce PIC code" >&5
 wl=

 can_build_shared=yes
@@ -14496,18 +14500,18 @@

   # Check to make sure the dll_cflags actually works.
   echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:14500: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:14504: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 14504 "configure"
+#line 14508 "configure"
 #include "confdefs.h"

 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*

     # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
@@ -14538,7 +14542,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14542: checking if C compiler can produce shared libraries" >&5
+echo "configure:14546: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -14589,14 +14593,14 @@
   xe_libs=
   ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
   cat > conftest.$ac_ext <<EOF
-#line 14593 "configure"
+#line 14597 "configure"
 #include "confdefs.h"

 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -14621,7 +14625,7 @@
   if test "$XEGCC" = yes; then
     # Check if gcc -print-prog-name=ld gives a path.
     echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:14625: checking for ld used by GCC" >&5
+echo "configure:14629: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -14647,7 +14651,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14651: checking for GNU ld" >&5
+echo "configure:14655: checking for GNU ld" >&5
   fi

   if test -z "$LTLD"; then
@@ -14685,7 +14689,7 @@

 # Check to see if it really is or isn't GNU ld.
 echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:14689: checking if the linker is GNU ld" >&5
+echo "configure:14693: checking if the linker is GNU ld" >&5
 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
   xe_gnu_ld=yes
@@ -14713,7 +14717,7 @@
   # OK - only NOW do we futz about with ld.
   # See if the linker supports building shared libraries.
   echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:14717: checking whether the linker supports shared libraries" >&5
+echo "configure:14721: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -14921,10 +14925,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14925: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14928 "configure"
+echo "configure:14929: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14932 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14947,7 +14951,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:14951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -14986,11 +14990,11 @@
 fi

 cat > conftest.$ac_ext <<EOF
-#line 14990 "configure"
+#line 14994 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:14994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:14998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
--- a/src/ChangeLog	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/ChangeLog	Wed Jun 05 09:58:45 2002 +0000
@@ -1,3 +1,859 @@
+2002-06-05  Ben Wing  <ben@xemacs.org>
+
+	* abbrev.c (abbrev_match_mapper):
+	* abbrev.c (abbrev_oblookup):
+	* abbrev.c (obarray_has_blank_p):
+	* abbrev.c (abbrev_count_case):
+	* alloc.c (make_uninit_string):
+	* alloc.c (resize_string):
+	* alloc.c (set_string_char):
+	* alloc.c (Fmake_string):
+	* alloc.c (Fstring):
+	* alloc.c (init_string_ascii_begin):
+	* alloc.c (make_string):
+	* alloc.c (build_intstring):
+	* alloc.c (build_string):
+	* alloc.c (build_msg_intstring):
+	* alloc.c (build_msg_string):
+	* alloc.c (make_string_nocopy):
+	* alloc.c (debug_string_purity_print):
+	* alloc.c (garbage_collect_1):
+	* buffer.c:
+	* buffer.c (Fgenerate_new_buffer_name):
+	* buffer.c (directory_is_current_directory):
+	* buffer.c (get_initial_directory):
+	* buffer.c (init_initial_directory):
+	* buffer.h:
+	* buffer.h (struct buffer_text):
+	* buffer.h (VALIDATE_BYTEBPOS_BACKWARD):
+	* buffer.h (VALIDATE_BYTEBPOS_FORWARD):
+	* buffer.h (BYTE_BUF_FETCH_CHAR):
+	* buffer.h (BYTE_BUF_FETCH_CHAR_RAW):
+	* buffer.h (BYTE_BUF_ITEXT_COPY_ICHAR):
+	* buffer.h (BUFFER_TEXT_LOOP):
+	* buffer.h (BUFFER_ALLOC):
+	* bytecode.c (invalid_byte_code):
+	* bytecode.c (READ_INSTRUCTION_CHAR):
+	* bytecode.c (optimize_byte_code):
+	* bytecode.c (compiled_function_instructions):
+	* callint.c (callint_prompt):
+	* callint.c (PROMPT):
+	* casefiddle.c (casify_object):
+	* casefiddle.c (casify_region_internal):
+	* casetab.c (compute_up_or_eqv_mapper):
+	* casetab.c (convert_old_style_syntax_string):
+	* casetab.c (complex_vars_of_casetab):
+	* charset.h:
+	* charset.h (ichar_charset):
+	* charset.h (BREAKUP_ICHAR):
+	* charset.h (struct Lisp_Charset):
+	* charset.h (CHARSET_LEADING_BYTE):
+	* charset.h (struct charset_lookup):
+	* charset.h (ICHAR_FIELD1_MASK):
+	* charset.h (ichar_field1):
+	* charset.h (MIN_ICHAR_FIELD2_OFFICIAL):
+	* charset.h (MIN_ICHAR_FIELD1_OFFICIAL):
+	* charset.h (MIN_ICHAR_FIELD2_PRIVATE):
+	* charset.h (MIN_ICHAR_FIELD1_PRIVATE):
+	* charset.h (MIN_CHAR_OFFICIAL_TYPE9N):
+	* charset.h (BREAKUP_ICHAR_1_UNSAFE):
+	* chartab.c (get_non_ascii_char_table_value):
+	* chartab.c (put_char_table):
+	* chartab.c (map_over_charset_ascii_1):
+	* chartab.c (map_over_charset_row):
+	* chartab.c (map_over_other_charset):
+	* chartab.c (map_char_table):
+	* chartab.c (chartab_instantiate):
+	* chartab.c (check_category_char):
+	* chartab.c (Fcheck_category_at):
+	* chartab.c (Fchar_in_category_p):
+	* chartab.c (word_boundary_p):
+	* chartab.h:
+	* chartab.h (struct chartab_range):
+	* cmds.c:
+	* cmds.c (Fself_insert_command):
+	* cmds.c (internal_self_insert):
+	* console-gtk.h:
+	* console-msw.c (GetConsoleHwnd):
+	* console-msw.c (mswindows_output_console_string):
+	* console-msw.c (Fmswindows_debugging_output):
+	* console-msw.c (write_string_to_mswindows_debugging_output):
+	* console-msw.c (DSTRING):
+	* console-msw.c (DSYMNAME):
+	* console-msw.h:
+	* console-stream.c (stream_text_width):
+	* console-tty.c (tty_init_console):
+	* console-x.c (split_up_display_spec):
+	* console-x.c (x_semi_canonicalize_console_connection):
+	* console-x.h:
+	* console.h (struct console_methods):
+	* console.h (struct console):
+	* data.c (Fsubr_interactive):
+	* data.c (Faref):
+	* device-msw.c (msprinter_default_printer):
+	* device-msw.c (sync_printer_with_devmode):
+	* device-x.c (sanity_check_geometry_resource):
+	* device-x.c (signal_if_x_error):
+	* device-x.c (x_IO_error_handler):
+	* device-x.c (Fx_get_resource_prefix):
+	* dialog-msw.c (button_width):
+	* dialog-msw.c (handle_question_dialog_box):
+	* dired-msw.c (struct):
+	* dired-msw.c (mswindows_get_files):
+	* dired-msw.c (mswindows_format_file):
+	* dired-msw.c (Fmswindows_insert_directory):
+	* dired.c (Fdirectory_files):
+	* dired.c (file_name_completion_stat):
+	* dired.c (file_name_completion):
+	* dired.c (struct user_name):
+	* dired.c (user_name_completion):
+	* dired.c (make_directory_hash_table):
+	* dired.c (Ffile_attributes):
+	* doc.c (unparesseuxify_doc_string):
+	* doc.c (get_doc_string):
+	* doc.c (weird_doc):
+	* doc.c (Fsnarf_documentation):
+	* doc.c (Fsubstitute_command_keys):
+	* doprnt.c (union printf_arg):
+	* doprnt.c (doprnt_2):
+	* doprnt.c (parse_off_posnum):
+	* doprnt.c (parse_doprnt_spec):
+	* doprnt.c (get_doprnt_args):
+	* doprnt.c (emacs_doprnt_1):
+	* doprnt.c (emacs_doprnt_va):
+	* doprnt.c (emacs_doprnt):
+	* doprnt.c (emacs_vsprintf_string_lisp):
+	* doprnt.c (emacs_sprintf_string_lisp):
+	* doprnt.c (emacs_vsprintf_malloc_lisp):
+	* doprnt.c (emacs_sprintf_malloc_lisp):
+	* doprnt.c (emacs_vsprintf_string):
+	* doprnt.c (emacs_sprintf_string):
+	* doprnt.c (emacs_vsprintf_malloc):
+	* doprnt.c (emacs_sprintf_malloc):
+	* doprnt.c (emacs_vsprintf):
+	* doprnt.c (emacs_sprintf):
+	* editfns.c:
+	* editfns.c (init_editfns):
+	* editfns.c (Fchar_to_string):
+	* editfns.c (Fstring_to_char):
+	* editfns.c (Ftemp_directory):
+	* editfns.c (Fuser_login_name):
+	* editfns.c (user_login_name):
+	* editfns.c (Fuser_full_name):
+	* editfns.c (get_home_directory):
+	* editfns.c (Fuser_home_directory):
+	* editfns.c (Fcurrent_time_string):
+	* editfns.c (Fcurrent_time_zone):
+	* editfns.c (Finsert_char):
+	* editfns.c (Fcompare_buffer_substrings):
+	* editfns.c (Fsubst_char_in_region):
+	* editfns.c (Ftranslate_region):
+	* editfns.c (Fchar_equal):
+	* eldap.c (Fldap_open):
+	* emodules.c (emodules_load):
+	* emodules.c (emodules_doc_subr):
+	* emodules.c (emodules_doc_sym):
+	* eval.c (print_subr):
+	* eval.c (build_error_data):
+	* eval.c (signal_error):
+	* eval.c (maybe_signal_error):
+	* eval.c (signal_continuable_error):
+	* eval.c (maybe_signal_continuable_error):
+	* eval.c (signal_error_2):
+	* eval.c (maybe_signal_error_2):
+	* eval.c (signal_continuable_error_2):
+	* eval.c (maybe_signal_continuable_error_2):
+	* eval.c (signal_ferror):
+	* eval.c (maybe_signal_ferror):
+	* eval.c (signal_continuable_ferror):
+	* eval.c (maybe_signal_continuable_ferror):
+	* eval.c (signal_ferror_with_frob):
+	* eval.c (maybe_signal_ferror_with_frob):
+	* eval.c (signal_continuable_ferror_with_frob):
+	* eval.c (maybe_signal_continuable_ferror_with_frob):
+	* eval.c (syntax_error):
+	* eval.c (syntax_error_2):
+	* eval.c (maybe_syntax_error):
+	* eval.c (sferror):
+	* eval.c (sferror_2):
+	* eval.c (maybe_sferror):
+	* eval.c (invalid_argument):
+	* eval.c (invalid_argument_2):
+	* eval.c (maybe_invalid_argument):
+	* eval.c (invalid_constant):
+	* eval.c (invalid_constant_2):
+	* eval.c (maybe_invalid_constant):
+	* eval.c (invalid_operation):
+	* eval.c (invalid_operation_2):
+	* eval.c (maybe_invalid_operation):
+	* eval.c (invalid_change):
+	* eval.c (invalid_change_2):
+	* eval.c (maybe_invalid_change):
+	* eval.c (invalid_state):
+	* eval.c (invalid_state_2):
+	* eval.c (maybe_invalid_state):
+	* eval.c (wtaerror):
+	* eval.c (stack_overflow):
+	* eval.c (out_of_memory):
+	* eval.c (printing_unreadable_object):
+	* eval.c (struct call_trapping_problems):
+	* eval.c (call_trapping_problems):
+	* eval.c (va_call_trapping_problems):
+	* eval.c (calln_trapping_problems):
+	* eval.c (call0_trapping_problems):
+	* eval.c (call1_trapping_problems):
+	* eval.c (call2_trapping_problems):
+	* eval.c (call3_trapping_problems):
+	* eval.c (call4_trapping_problems):
+	* eval.c (call5_trapping_problems):
+	* eval.c (eval_in_buffer_trapping_problems):
+	* eval.c (run_hook_trapping_problems):
+	* eval.c (safe_run_hook_trapping_problems):
+	* eval.c (run_hook_with_args_in_buffer_trapping_problems):
+	* eval.c (run_hook_with_args_trapping_problems):
+	* eval.c (va_run_hook_with_args_trapping_problems):
+	* eval.c (va_run_hook_with_args_in_buffer_trapping_problems):
+	* eval.c (warn_when_safe):
+	* event-Xt.c (x_keysym_to_character):
+	* event-Xt.c (x_to_emacs_keysym):
+	* event-Xt.c (x_event_to_emacs_event):
+	* event-Xt.c (check_for_tty_quit_char):
+	* event-gtk.c (gtk_to_emacs_keysym):
+	* event-gtk.c (dragndrop_data_received):
+	* event-gtk.c (check_for_tty_quit_char):
+	* event-msw.c (mswindows_dde_callback):
+	* event-msw.c (mswindows_wnd_proc):
+	* event-stream.c (allocate_command_builder):
+	* event-stream.c (echo_key_event):
+	* event-stream.c (maybe_kbd_translate):
+	* event-stream.c (command_builder_find_leaf_no_mule_processing):
+	* event-stream.c (command_builder_find_leaf):
+	* event-stream.c (lookup_command_event):
+	* event-stream.c (dribble_out_event):
+	* event-unixoid.c (read_event_from_tty_or_stream_desc):
+	* event-unixoid.c (event_stream_unixoid_create_io_streams):
+	* events.c (character_to_event):
+	* events.c (event_to_character):
+	* events.c (Fevent_to_character):
+	* events.c (nth_of_key_sequence_as_event):
+	* events.h:
+	* events.h (struct key_data):
+	* events.h (struct command_builder):
+	* file-coding.c (setup_eol_coding_systems):
+	* file-coding.c (make_coding_system_1):
+	* file-coding.c (no_conversion_convert):
+	* file-coding.c (convert_eol_convert):
+	* file-coding.c (look_for_coding_system_magic_cookie):
+	* file-coding.h:
+	* fileio.c:
+	* fileio.c (report_file_type_error):
+	* fileio.c (report_error_with_errno):
+	* fileio.c (report_file_error):
+	* fileio.c (lisp_strerror):
+	* fileio.c (Ffile_name_directory):
+	* fileio.c (Ffile_name_nondirectory):
+	* fileio.c (file_name_as_directory):
+	* fileio.c (Ffile_name_as_directory):
+	* fileio.c (directory_file_name):
+	* fileio.c (Fdirectory_file_name):
+	* fileio.c (Fmake_temp_name):
+	* fileio.c (if):
+	* fileio.c (Ffile_truename):
+	* fileio.c (Fsubstitute_in_file_name):
+	* fileio.c (Ffile_name_absolute_p):
+	* fileio.c (check_writable):
+	* fileio.c (Ffile_writable_p):
+	* fileio.c (Ffile_symlink_p):
+	* fileio.c (a_write):
+	* filelock.c (struct):
+	* filelock.c (MAKE_LOCK_NAME):
+	* filelock.c (fill_in_lock_file_name):
+	* filelock.c (lock_file_1):
+	* filelock.c (current_lock_owner):
+	* filelock.c (lock_if_free):
+	* filelock.c (lock_file):
+	* filelock.c (unlock_file):
+	* filelock.c (Ffile_locked_p):
+	* fns.c:
+	* fns.c (Fstring_lessp):
+	* fns.c (concat):
+	* fns.c (split_string_by_ichar_1):
+	* fns.c (split_external_path):
+	* fns.c (split_env_path):
+	* fns.c (Fsplit_string_by_char):
+	* fns.c (Fsplit_path):
+	* fns.c (Ffillarray):
+	* fns.c (mapcar1):
+	* fns.c (ADVANCE_INPUT):
+	* fns.c (base64_encode_1):
+	* fns.c (STORE_BYTE):
+	* fns.c (base64_decode_1):
+	* fns.c (Fbase64_encode_region):
+	* fns.c (Fbase64_encode_string):
+	* fns.c (Fbase64_decode_region):
+	* fns.c (Fbase64_decode_string):
+	* fns.c (vars_of_fns):
+	* font-lock.c (struct context_cache):
+	* font-lock.c (find_context):
+	* frame-gtk.c (gtk_set_frame_text_value):
+	* frame-gtk.c (gtk_set_title_from_ibyte):
+	* frame-gtk.c (gtk_set_icon_name_from_ibyte):
+	* frame-gtk.c (console_type_create_frame_gtk):
+	* frame-msw.c (mswindows_set_title_from_ibyte):
+	* frame-msw.c (console_type_create_frame_mswindows):
+	* frame-x.c (color_to_string):
+	* frame-x.c (x_set_frame_text_value):
+	* frame-x.c (x_set_title_from_ibyte):
+	* frame-x.c (x_set_icon_name_from_ibyte):
+	* frame-x.c (x_cde_transfer_callback):
+	* frame-x.c (Fx_window_id):
+	* frame-x.c (console_type_create_frame_x):
+	* frame.c:
+	* frame.c (allocate_frame_core):
+	* frame.c (Fmake_frame):
+	* frame.c (generate_title_string):
+	* frame.c (update_frame_title):
+	* frame.c (init_frame):
+	* glyphs-eimage.c (my_jpeg_output_message):
+	* glyphs-eimage.c (gif_instantiate):
+	* glyphs-msw.c (struct color_symbol):
+	* glyphs-msw.c (xpm_to_eimage):
+	* glyphs-msw.c (struct):
+	* glyphs-msw.c (resource_name_to_resource):
+	* glyphs-msw.c (mswindows_xface_instantiate):
+	* glyphs-msw.c (charset_of_text):
+	* glyphs-msw.c (mswindows_widget_instantiate):
+	* glyphs-x.c (x_locate_pixmap_file):
+	* glyphs-x.c (x_xface_instantiate):
+	* glyphs-x.c (safe_XLoadFont):
+	* glyphs-x.c (font_instantiate):
+	* glyphs.c (print_image_instance):
+	* glyphs.c (signal_image_error):
+	* glyphs.c (signal_image_error_2):
+	* glyphs.c (signal_double_image_error):
+	* glyphs.c (signal_double_image_error_2):
+	* glyphs.c (query_string_geometry):
+	* glyphs.c (query_string_font):
+	* glyphs.c (display_table_entry):
+	* glyphs.h:
+	* gpmevent.c (tty_get_foreign_selection):
+	* gui-x.c (menu_separator_style_and_to_external):
+	* gui-x.c (add_accel_and_to_external):
+	* gui-x.c (button_item_to_widget_value):
+	* gui-x.h:
+	* gui.c (separator_string_p):
+	* gui.c (gui_name_accelerator):
+	* gui.h:
+	* hpplay.c (player_error_internal):
+	* indent.c (column_at_point):
+	* indent.c (string_column_at_point):
+	* indent.c (byte_spaces_at_point):
+	* indent.c (Fmove_to_column):
+	* insdel.c (gap_left):
+	* insdel.c (gap_right):
+	* insdel.c (make_gap):
+	* insdel.c (fixup_internal_substring):
+	* insdel.c (buffer_insert_string_1):
+	* insdel.c (buffer_insert_raw_string_1):
+	* insdel.c (buffer_insert_c_string_1):
+	* insdel.c (buffer_insert_emacs_char_1):
+	* insdel.c (buffer_insert_c_char_1):
+	* insdel.c (buffer_delete_range):
+	* insdel.c (buffer_replace_char):
+	* insdel.h:
+	* intl-win32.c (convert_multibyte_to_internal_malloc):
+	* keymap.c (make_key_description):
+	* keymap.c (keymap_lookup_directly):
+	* keymap.c (keymap_store):
+	* keymap.c (define_key_check_and_coerce_keysym):
+	* keymap.c (Fdefine_key):
+	* keymap.c (Flookup_key):
+	* keymap.c (map_keymap_sort_predicate):
+	* keymap.c (Fkey_description):
+	* keymap.c (Ftext_char_description):
+	* keymap.c (describe_map):
+	* keymap.c (vars_of_keymap):
+	* line-number.c (insert_invalidate_line_number_cache):
+	* line-number.h:
+	* lisp-disunion.h:
+	* lisp-union.h:
+	* lisp.h:
+	* lisp.h (struct):
+	* lisp.h (struct Lisp_String):
+	* lisp.h (XCHAR):
+	* lisp.h (DECLARE_INLINE_HEADER):
+	* lread.c:
+	* lread.c (readchar):
+	* lread.c (unreadchar):
+	* lread.c (Fload_internal):
+	* lread.c (locate_file_map_suffixes):
+	* lread.c (locate_file_in_directory_mapper):
+	* lread.c (locate_file_construct_suffixed_files_mapper):
+	* lread.c (readevalloop):
+	* lread.c (read0):
+	* lread.c (read_escape):
+	* lread.c (read_atom_0):
+	* lread.c (read_atom):
+	* lread.c (parse_integer):
+	* lread.c (read_bit_vector):
+	* lread.c (read_structure):
+	* lread.c (reader_nextchar):
+	* lread.c (read1):
+	* lread.c (isfloat_string):
+	* lread.c (sequence_reader):
+	* lread.c (read_list_conser):
+	* lread.c (read_list):
+	* lread.c (read_vector):
+	* lread.c (read_compiled_function):
+	* lrecord.h:
+	* lstream.c:
+	* lstream.c (Lstream_really_write):
+	* lstream.c (Lstream_read_1):
+	* lstream.c (struct filedesc_stream):
+	* lstream.c (filedesc_writer):
+	* lstream.c (filedesc_stream_set_pty_flushing):
+	* lstream.c (lisp_string_reader):
+	* lstream.c (lisp_string_rewinder):
+	* lstream.c (lisp_buffer_reader):
+	* lstream.c (lisp_buffer_writer):
+	* lstream.h:
+	* lstream.h (Lstream_get_ichar):
+	* md5.c (Fmd5):
+	* menubar-msw.c:
+	* menubar-msw.c (mswindows_translate_menu_or_dialog_item):
+	* menubar-msw.c (displayable_menu_item):
+	* menubar-msw.c (populate_menu_add_item):
+	* menubar-msw.c (mswindows_char_is_accelerator):
+	* menubar-x.c (menu_item_descriptor_to_widget_value_1):
+	* menubar.c (Fnormalize_menu_item_name):
+	* minibuf.c (scmp_1):
+	* minibuf.c (regexp_ignore_completion_p):
+	* minibuf.c (Fall_completions):
+	* minibuf.c (echo_area_append):
+	* minibuf.c (echo_area_message):
+	* minibuf.c (message_internal):
+	* minibuf.c (message_append_internal):
+	* minibuf.c (message_1):
+	* minibuf.c (message_append_1):
+	* mule-ccl.c:
+	* mule-ccl.c (CCL_WRITE_CHAR):
+	* mule-ccl.c (CCL_WRITE_STRING):
+	* mule-ccl.c (CCL_MAKE_CHAR):
+	* mule-charset.c (make_charset):
+	* mule-charset.c (Fmake_charset):
+	* mule-coding.c (shift_jis_convert):
+	* mule-coding.c (Fdecode_shift_jis_char):
+	* mule-coding.c (Fencode_shift_jis_char):
+	* mule-coding.c (big5_convert):
+	* mule-coding.c (decode_big5_char):
+	* mule-coding.c (Fdecode_big5_char):
+	* mule-coding.c (Fencode_big5_char):
+	* mule-coding.c (charset_by_attributes_or_create_one):
+	* mule-coding.c (iso2022_decode):
+	* mule-coding.c (iso2022_encode):
+	* mule-wnnfns.c (Fwnn_dict_list):
+	* mule-wnnfns.c (Fwnn_fuzokugo_get):
+	* mule-wnnfns.c (m2w):
+	* ndir.h:
+	* nt.c:
+	* nt.c (getpwnam):
+	* nt.c (parse_root):
+	* nt.c (get_long_basename):
+	* nt.c (mswindows_get_long_filename):
+	* nt.c (is_unc_volume):
+	* nt.c (nt_get_resource):
+	* nt.c (init_mswindows_environment):
+	* nt.c (volume_info_data):
+	* nt.c (lookup_volume_info):
+	* nt.c (add_volume_info):
+	* nt.c (get_cached_volume_information):
+	* nt.c (get_volume_info):
+	* nt.c (is_exec):
+	* nt.c (mswindows_opendir):
+	* nt.c (mswindows_readdir):
+	* nt.c (open_unc_volume):
+	* nt.c (read_unc_volume):
+	* nt.c (unc_volume_file_attributes):
+	* nt.c (mswindows_access):
+	* nt.c (mswindows_link):
+	* nt.c (mswindows_rename):
+	* nt.c (mswindows_unlink):
+	* nt.c (mswindows_fstat):
+	* nt.c (mswindows_stat):
+	* nt.c (mswindows_getdcwd):
+	* nt.c (open_input_file):
+	* nt.c (open_output_file):
+	* nt.c (mswindows_executable_type):
+	* nt.c (Fmswindows_short_file_name):
+	* nt.c (Fmswindows_long_file_name):
+	* nt.c (init_nt):
+	* objects-gtk.c (gtk_parse_nearest_color):
+	* objects-gtk.c (gtk_font_spec_matches_charset):
+	* objects-gtk.c (gtk_find_charset_font):
+	* objects-gtk.h:
+	* objects-msw.c (hexval):
+	* objects-msw.c (mswindows_string_to_color):
+	* objects-msw.c (match_font):
+	* objects-msw.c (font_enum_callback_2):
+	* objects-msw.c (create_hfont_from_font_spec):
+	* objects-msw.c (initialize_font_instance):
+	* objects-msw.c (mswindows_list_fonts):
+	* objects-msw.c (mswindows_font_instance_truename):
+	* objects-msw.c (mswindows_font_spec_matches_charset_stage_1):
+	* objects-msw.c (mswindows_font_spec_matches_charset):
+	* objects-tty.c (tty_initialize_font_instance):
+	* objects-tty.c (tty_font_spec_matches_charset):
+	* objects-tty.c (tty_find_charset_font):
+	* objects-x.c (x_font_instance_properties):
+	* objects-x.c (x_font_spec_matches_charset):
+	* objects-x.c (x_find_charset_font):
+	* objects.c (font_spec_matches_charset):
+	* objects.h:
+	* postgresql.c (init_postgresql_from_environment):
+	* print.c:
+	* print.c (write_string_to_stdio_stream):
+	* print.c (std_handle_out_va):
+	* print.c (stderr_out):
+	* print.c (stdout_out):
+	* print.c (debug_out):
+	* print.c (fatal):
+	* print.c (output_string):
+	* print.c (write_string_1):
+	* print.c (write_string):
+	* print.c (write_c_string):
+	* print.c (write_fmt_string):
+	* print.c (write_fmt_string_lisp):
+	* print.c (stderr_out_lisp):
+	* print.c (Fwrite_char):
+	* print.c (float_to_string):
+	* print.c (print_string):
+	* print.c (print_internal):
+	* print.c (print_symbol):
+	* print.c (Falternate_debugging_output):
+	* print.c (write_string_to_alternate_debugging_output):
+	* print.c (Fexternal_debugging_output):
+	* process-nt.c (mswindows_compare_env):
+	* process-nt.c (nt_create_process):
+	* process-nt.c (nt_send_process):
+	* process-unix.c:
+	* process-unix.c (allocate_pty):
+	* process-unix.c (relocate_fd):
+	* process-unix.c (child_setup):
+	* process-unix.c (unix_create_process):
+	* process-unix.c (unix_send_process):
+	* process-unix.c (unix_process_send_eof):
+	* process-unix.c (unix_kill_child_process):
+	* process-unix.c (unix_canonicalize_host_name):
+	* process-unix.c (unix_open_network_stream):
+	* process.c (read_process_output):
+	* process.c (send_process):
+	* process.c (status_message):
+	* process.c (decode_signal):
+	* process.c (getenv_internal):
+	* process.c (putenv_internal):
+	* process.c (Fgetenv):
+	* process.c (egetenv):
+	* process.c (eputenv):
+	* process.c (init_xemacs_process):
+	* procimpl.h:
+	* realpath.c:
+	* realpath.c (mswindows_readlink_and_correct_case):
+	* realpath.c (cygwin_readlink_and_correct_case):
+	* realpath.c (mswindows_abs_start):
+	* realpath.c (qxe_realpath):
+	* redisplay-gtk.c:
+	* redisplay-gtk.c (separate_textual_runs):
+	* redisplay-gtk.c (gtk_text_width):
+	* redisplay-gtk.c (gtk_output_display_block):
+	* redisplay-gtk.c (gtk_output_string):
+	* redisplay-msw.c (separate_textual_runs):
+	* redisplay-msw.c (mswindows_output_cursor):
+	* redisplay-msw.c (mswindows_output_string):
+	* redisplay-msw.c (mswindows_output_display_block):
+	* redisplay-msw.c (mswindows_text_width):
+	* redisplay-output.c (redisplay_output_layout):
+	* redisplay-tty.c:
+	* redisplay-tty.c (tty_text_width):
+	* redisplay-tty.c (tty_output_display_block):
+	* redisplay-tty.c (tty_output_ibyte_string):
+	* redisplay-tty.c (tty_output_ichar_dynarr):
+	* redisplay-tty.c (substitute_in_dynamic_color_string):
+	* redisplay-tty.c (set_foreground_to):
+	* redisplay-tty.c (set_background_to):
+	* redisplay-x.c:
+	* redisplay-x.c (separate_textual_runs):
+	* redisplay-x.c (x_text_width):
+	* redisplay-x.c (x_output_display_block):
+	* redisplay-x.c (x_output_string):
+	* redisplay.c:
+	* redisplay.c (position_redisplay_data_type):
+	* redisplay.c (struct prop_block):
+	* redisplay.c (redisplay_text_width_ichar_string):
+	* redisplay.c (redisplay_text_width_string):
+	* redisplay.c (redisplay_frame_text_width_string):
+	* redisplay.c (add_ichar_rune_1):
+	* redisplay.c (add_ichar_rune):
+	* redisplay.c (add_ibyte_string_runes):
+	* redisplay.c (ADD_NEXT_OCTAL_RUNE_CHAR):
+	* redisplay.c (add_octal_runes):
+	* redisplay.c (add_control_char_runes):
+	* redisplay.c (add_disp_table_entry_runes_1):
+	* redisplay.c (add_propagation_runes):
+	* redisplay.c (add_glyph_rune):
+	* redisplay.c (create_text_block):
+	* redisplay.c (create_overlay_glyph_block):
+	* redisplay.c (generate_formatted_string_db):
+	* redisplay.c (add_string_to_fstring_db_runes):
+	* redisplay.c (generate_fstring_runes):
+	* redisplay.c (create_string_text_block):
+	* redisplay.c (decode_mode_spec):
+	* redisplay.c (init_redisplay):
+	* redisplay.h:
+	* redisplay.h (struct rune):
+	* regex.c:
+	* regex.c (RE_TRANSLATE_1):
+	* regex.c (itext_ichar):
+	* regex.c (INC_IBYTEPTR):
+	* regex.c (PATFETCH_RAW):
+	* regex.c (PATUNFETCH):
+	* regex.c (regex_compile):
+	* regex.c (compile_range):
+	* regex.c (compile_extended_range):
+	* regex.c (re_compile_fastmap):
+	* regex.c (re_search_2):
+	* regex.c (re_match_2_internal):
+	* search.c:
+	* search.c (TRANSLATE):
+	* search.c (fixup_search_regs_for_string):
+	* search.c (fast_string_match):
+	* search.c (byte_scan_buffer):
+	* search.c (scan_buffer):
+	* search.c (byte_find_next_ichar_in_string):
+	* search.c (skip_chars):
+	* search.c (trivial_regexp_p):
+	* search.c (search_buffer):
+	* search.c (simple_search):
+	* search.c (boyer_moore):
+	* search.c (wordify):
+	* search.c (Freplace_match):
+	* search.c (Fregexp_quote):
+	* select-common.h (lisp_data_to_selection_data):
+	* select-gtk.c (atom_to_symbol):
+	* select-x.c (x_atom_to_symbol):
+	* select-x.c (hack_motif_clipboard_selection):
+	* select-x.c (Fx_store_cutbuffer_internal):
+	* sound.h (sound_perror):
+	* symbols.c (intern_int):
+	* symbols.c (intern):
+	* symbols.c (intern_converting_underscores_to_dashes):
+	* symbols.c (oblookup):
+	* symbols.c (hash_string):
+	* symbols.c (init_symbols_once_early):
+	* symbols.c (defsymbol_massage_name_1):
+	* symbols.c (defsymbol_nodump):
+	* symbols.c (defsymbol):
+	* symbols.c (defvar_magic):
+	* syntax.c (struct lisp_parse_state):
+	* syntax.c (syntax_match):
+	* syntax.c (WORD_BOUNDARY_P):
+	* syntax.c (scan_words):
+	* syntax.c (find_start_of_comment):
+	* syntax.c (Fforward_comment):
+	* syntax.c (scan_lists):
+	* syntax.c (Fbackward_prefix_chars):
+	* syntax.c (scan_sexps_forward):
+	* syntax.c (complex_vars_of_syntax):
+	* syntax.h:
+	* sysdep.c:
+	* sysdep.c (sys_subshell):
+	* sysdep.c (get_eof_char):
+	* sysdep.c (init_system_name):
+	* sysdep.c (qxe_open):
+	* sysdep.c (qxe_interruptible_open):
+	* sysdep.c (qxe_fopen):
+	* sysdep.c (qxe_chdir):
+	* sysdep.c (qxe_mkdir):
+	* sysdep.c (qxe_opendir):
+	* sysdep.c (qxe_readdir):
+	* sysdep.c (qxe_rmdir):
+	* sysdep.c (qxe_allocating_getcwd):
+	* sysdep.c (qxe_access):
+	* sysdep.c (qxe_eaccess):
+	* sysdep.c (qxe_lstat):
+	* sysdep.c (qxe_readlink):
+	* sysdep.c (qxe_stat):
+	* sysdep.c (qxe_chmod):
+	* sysdep.c (qxe_link):
+	* sysdep.c (qxe_rename):
+	* sysdep.c (qxe_symlink):
+	* sysdep.c (qxe_unlink):
+	* sysdep.c (qxe_execve):
+	* sysdep.c (qxe_getpwnam):
+	* sysdep.c (qxe_ctime):
+	* sysdep.h:
+	* sysdir.h:
+	* sysdir.h (qxe_allocating_getcwd):
+	* sysfile.h:
+	* sysfile.h (DECLARE_INLINE_HEADER):
+	* sysproc.h:
+	* syspwd.h:
+	* systime.h:
+	* syswindows.h:
+	* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
+	* syswindows.h (LOCAL_TO_WIN32_FILE_FORMAT):
+	* syswindows.h (WIN32_TO_LOCAL_FILE_FORMAT):
+	* syswindows.h (LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
+	* syswindows.h (file_data):
+	* syswindows.h (DECLARE_INLINE_HEADER):
+	* termcap.c (tgetent):
+	* tests.c (Ftest_data_format_conversion):
+	* text.c:
+	* text.c (qxesprintf):
+	* text.c (qxestrcasecmp):
+	* text.c (ascii_strcasecmp):
+	* text.c (qxestrcasecmp_c):
+	* text.c (qxestrcasecmp_i18n):
+	* text.c (qxestrncasecmp):
+	* text.c (ascii_strncasecmp):
+	* text.c (qxestrncasecmp_c):
+	* text.c (qxestrncasecmp_i18n):
+	* text.c (qxememcmp):
+	* text.c (qxememcmp4):
+	* text.c (qxememcasecmp):
+	* text.c (qxememcasecmp4):
+	* text.c (qxetextcmp):
+	* text.c (qxetextcmp_matching):
+	* text.c (qxetextcasecmp):
+	* text.c (qxetextcasecmp_matching):
+	* text.c (lisp_strcasecmp):
+	* text.c (convert_ibyte_string_into_ichar_dynarr):
+	* text.c (convert_ibyte_string_into_ichar_string):
+	* text.c (convert_ichar_string_into_ibyte_dynarr):
+	* text.c (convert_ichar_string_into_malloced_string):
+	* text.c (COPY_TEXT_BETWEEN_FORMATS):
+	* text.c (copy_text_between_formats):
+	* text.c (copy_buffer_text_out):
+	* text.c (find_charsets_in_ibyte_string):
+	* text.c (find_charsets_in_ichar_string):
+	* text.c (ibyte_string_displayed_columns):
+	* text.c (ichar_string_displayed_columns):
+	* text.c (ibyte_string_nonascii_chars):
+	* text.c (eistr_casefiddle_1):
+	* text.c (eito_malloc_1):
+	* text.c (eicmp_1):
+	* text.c (eicpyout_malloc_fmt):
+	* text.c (skip_ascii):
+	* text.c (bytecount_to_charcount_fun):
+	* text.c (charcount_to_bytecount_fun):
+	* text.c (struct):
+	* text.c (dfc_convert_to_external_format):
+	* text.c (dfc_convert_to_internal_format):
+	* text.c (non_ascii_set_itext_ichar):
+	* text.c (non_ascii_itext_ichar):
+	* text.c (non_ascii_valid_ichar_p):
+	* text.c (non_ascii_itext_copy_ichar):
+	* text.c (Lstream_get_ichar_1):
+	* text.c (Lstream_fput_ichar):
+	* text.c (Lstream_funget_ichar):
+	* text.c (Fmake_char):
+	* text.c (Fchar_charset):
+	* text.c (Fchar_octet):
+	* text.c (Fsplit_char):
+	* text.c (lookup_composite_char):
+	* text.c (composite_char_string):
+	* text.c (Fcomposite_char_string):
+	* text.c (reinit_vars_of_text):
+	* text.h:
+	* text.h (MAX_ICHAR_LEN):
+	* text.h (ibyte_first_byte_p):
+	* text.h (ibyte_leading_byte_p):
+	* text.h (ichar_multibyte_p):
+	* text.h (ichar_ascii_p):
+	* text.h (ichar_16_bit_fixed_p):
+	* text.h (ichar_to_raw):
+	* text.h (valid_ibyteptr_p):
+	* text.h (assert_valid_ibyteptr):
+	* text.h (INC_IBYTEPTR):
+	* text.h (INC_IBYTEPTR_FMT):
+	* text.h (DEC_IBYTEPTR):
+	* text.h (DEC_IBYTEPTR_FMT):
+	* text.h (VALIDATE_IBYTEPTR_BACKWARD):
+	* text.h (VALIDATE_IBYTEPTR_FORWARD):
+	* text.h (validate_ibyte_string_backward):
+	* text.h (itext_ichar_len):
+	* text.h (INC_BYTECOUNT):
+	* text.h (simple_itext_ichar):
+	* text.h (itext_ichar):
+	* text.h (valid_ichar_p):
+	* text.h (CHAR_INTP):
+	* text.h (ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE):
+	* text.h (LISP_STRING_TO_ALLOCA):
+	* text.h (alloca_ibytes):
+	* text.h (struct):
+	* text.h (EI_ALLOC):
+	* text.h (eicpy_lstr_off):
+	* text.h (eicpy_raw_fmt):
+	* text.h (eicpy_rawz_fmt):
+	* text.h (eicpy_ch):
+	* text.h (eireset):
+	* text.h (eito_alloca):
+	* text.h (DECLARE_INLINE_HEADER):
+	* text.h (eigetch):
+	* text.h (eicat_c):
+	* text.h (eicat_raw):
+	* text.h (eicat_rawz):
+	* text.h (eicat_ch):
+	* text.h (eisub_1):
+	* text.h (eisub_ch):
+	* text.h (EI_CASECHANGE):
+	* text.h (DFC_LISP_STRING_USE_CONVERTED_DATA):
+	* text.h (GET_STRERROR):
+	* toolbar-common.c (common_output_toolbar_button):
+	* tooltalk.c (check_status):
+	* tooltalk.c (tt_message_arg_bval_vector):
+	* ui-gtk.c (lisp_to_gtk_type):
+	* unexnt.c (unexec):
+	* unexnt.c (get_bss_info_from_map_file):
+	* unicode.c:
+	* unicode.c (sledgehammer_check_from_table):
+	* unicode.c (sledgehammer_check_to_table):
+	* unicode.c (set_unicode_conversion):
+	* unicode.c (ichar_to_unicode):
+	* unicode.c (unicode_to_char):
+	* unicode.c (Fchar_to_unicode):
+	* unicode.c (Funicode_to_char):
+	* unicode.c (decode_unicode_char):
+	* unicode.c (encode_unicode_char):
+	* unicode.c (unicode_convert):
+	* win32.c (urlify_filename):
+	* win32.c (tstr_to_local_file_format):
+	* win32.c (mswindows_canonicalize_filename):
+	* win32.c (mswindows_lisp_error_1):
+	* win32.c (Fmswindows_cygwin_to_win32_path):
+
+	Text/char naming rationalization.
+
+	[a] distinguish between "charptr" when it refers to operations on
+	the pointer itself and when it refers to operations on text; and
+	[b] use consistent naming for everything referring to internal
+	format, i.e.
+
+	Itext == text in internal format
+	Ibyte == a byte in such text
+	Ichar == a char as represented in internal character format
+
+	thus e.g.
+
+	set_charptr_emchar -> set_itext_ichar
+
+	The pre and post tags on either side of this change are:
+
+	pre-internal-format-textual-renaming
+	post-internal-format-textual-renaming
+
+	See the Internals Manual for details of exactly how this was done,
+	how to handle the change in your workspace, etc.
+
 2002-06-04  Andy Piper  <andy@xemacs.org>

 	* glyphs-widget.c (widget_logical_unit_height): don't try and
--- a/src/abbrev.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/abbrev.c	Wed Jun 05 09:58:45 2002 +0000
@@ -115,7 +115,7 @@
      normally want to expand it.  OTOH, if the abbrev begins with
      non-word syntax (e.g. `#if'), it is OK to abbreviate it anywhere.  */
   if (abbrev_length < closure->maxlen && abbrev_length > 0
-      && (WORD_SYNTAX_P (closure->chartab, string_emchar (abbrev, 0)))
+      && (WORD_SYNTAX_P (closure->chartab, string_ichar (abbrev, 0)))
       && (WORD_SYNTAX_P (closure->chartab,
 			 BUF_FETCH_CHAR (closure->buf,
 					 closure->point -
@@ -125,7 +125,7 @@
     }
   /* Match abbreviation string against buffer text.  */
   {
-    Intbyte *ptr = XSTRING_DATA (abbrev);
+    Ibyte *ptr = XSTRING_DATA (abbrev);
     Charcount idx;

     for (idx = 0; idx < abbrev_length; idx++)
@@ -133,11 +133,11 @@
 	if (DOWNCASE (closure->buf,
 		      BUF_FETCH_CHAR (closure->buf,
 				      closure->point - abbrev_length + idx))
-	    != DOWNCASE (closure->buf, charptr_emchar (ptr)))
+	    != DOWNCASE (closure->buf, itext_ichar (ptr)))
 	  {
 	    break;
 	  }
-	INC_CHARPTR (ptr);
+	INC_IBYTEPTR (ptr);
       }
     if (idx == abbrev_length)
       {
@@ -183,7 +183,7 @@
 abbrev_oblookup (struct buffer *buf, Lisp_Object obarray)
 {
   Charbpos wordstart, wordend;
-  Intbyte *word, *p;
+  Ibyte *word, *p;
   Charbpos idx;
   Lisp_Object lookup;

@@ -231,13 +231,13 @@
   if (wordend <= wordstart)
     return 0;

-  p = word = (Intbyte *) ALLOCA (MAX_EMCHAR_LEN * (wordend - wordstart));
+  p = word = (Ibyte *) ALLOCA (MAX_ICHAR_LEN * (wordend - wordstart));
   for (idx = wordstart; idx < wordend; idx++)
     {
-      Emchar c = BUF_FETCH_CHAR (buf, idx);
+      Ichar c = BUF_FETCH_CHAR (buf, idx);
       if (UPPERCASEP (buf, c))
 	c = DOWNCASE (buf, c);
-      p += set_charptr_emchar (p, c);
+      p += set_itext_ichar (p, c);
     }
   lookup = oblookup (obarray, word, p - word);
   if (SYMBOLP (lookup) && !NILP (symbol_value (XSYMBOL (lookup))))
@@ -250,7 +250,7 @@
 static int
 obarray_has_blank_p (Lisp_Object obarray)
 {
-  return !ZEROP (oblookup (obarray, (Intbyte *)" ", 1));
+  return !ZEROP (oblookup (obarray, (Ibyte *)" ", 1));
 }

 /* Analyze case in the buffer substring, and report it.  */
@@ -261,7 +261,7 @@
   *lccount = *uccount = 0;
   while (length--)
     {
-      Emchar c = BUF_FETCH_CHAR (buf, pos);
+      Ichar c = BUF_FETCH_CHAR (buf, pos);
       if (UPPERCASEP (buf, c))
 	++*uccount;
       else if (LOWERCASEP (buf, c))
--- a/src/alloc.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/alloc.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1935,7 +1935,7 @@
   set_lheader_implementation (&s->u.lheader, &lrecord_string);

   set_lispstringp_data (s, BIG_STRING_FULLSIZE_P (fullsize)
-		   ? xnew_array (Intbyte, length + 1)
+		   ? xnew_array (Ibyte, length + 1)
 		   : allocate_string_chars_struct (wrap_string (s),
 						   fullsize)->chars);

@@ -2006,7 +2006,7 @@
 	    memmove (XSTRING_DATA (s) + pos + delta,
 		     XSTRING_DATA (s) + pos, len);
 	  XSET_STRING_DATA
-	    (s, (Intbyte *) xrealloc (XSTRING_DATA (s),
+	    (s, (Ibyte *) xrealloc (XSTRING_DATA (s),
 				      XSTRING_LENGTH (s) + delta + 1));
 	  if (delta > 0 && pos >= 0)
 	    memmove (XSTRING_DATA (s) + pos + delta, XSTRING_DATA (s) + pos,
@@ -2014,9 +2014,9 @@
 	}
       else /* String has been demoted from BIG_STRING. */
 	{
-	  Intbyte *new_data =
+	  Ibyte *new_data =
 	    allocate_string_chars_struct (s, newfullsize)->chars;
-	  Intbyte *old_data = XSTRING_DATA (s);
+	  Ibyte *old_data = XSTRING_DATA (s);

 	  if (pos >= 0)
 	    {
@@ -2039,7 +2039,7 @@
 	     constraints). */
 	  if (pos >= 0)
 	    {
-	      Intbyte *addroff = pos + XSTRING_DATA (s);
+	      Ibyte *addroff = pos + XSTRING_DATA (s);

 	      memmove (addroff + delta, addroff,
 		       /* +1 due to zero-termination. */
@@ -2048,10 +2048,10 @@
 	}
       else
 	{
-	  Intbyte *old_data = XSTRING_DATA (s);
-	  Intbyte *new_data =
+	  Ibyte *old_data = XSTRING_DATA (s);
+	  Ibyte *new_data =
 	    BIG_STRING_FULLSIZE_P (newfullsize)
-	    ? xnew_array (Intbyte, XSTRING_LENGTH (s) + delta + 1)
+	    ? xnew_array (Ibyte, XSTRING_LENGTH (s) + delta + 1)
 	    : allocate_string_chars_struct (s, newfullsize)->chars;

 	  if (pos >= 0)
@@ -2100,12 +2100,12 @@
 /* WARNING: If you modify an existing string, you must call
    CHECK_LISP_WRITEABLE() before and bump_string_modiff() afterwards. */
 void
-set_string_char (Lisp_Object s, Charcount i, Emchar c)
+set_string_char (Lisp_Object s, Charcount i, Ichar c)
 {
-  Intbyte newstr[MAX_EMCHAR_LEN];
+  Ibyte newstr[MAX_ICHAR_LEN];
   Bytecount bytoff = string_index_char_to_byte (s, i);
-  Bytecount oldlen = charptr_emchar_len (XSTRING_DATA (s) + bytoff);
-  Bytecount newlen = set_charptr_emchar (newstr, c);
+  Bytecount oldlen = itext_ichar_len (XSTRING_DATA (s) + bytoff);
+  Bytecount newlen = set_itext_ichar (newstr, c);

   sledgehammer_check_ascii_begin (s);
   if (oldlen != newlen)
@@ -2144,8 +2144,8 @@
   CHECK_NATNUM (length);
   CHECK_CHAR_COERCE_INT (character);
   {
-    Intbyte init_str[MAX_EMCHAR_LEN];
-    int len = set_charptr_emchar (init_str, XCHAR (character));
+    Ibyte init_str[MAX_ICHAR_LEN];
+    int len = set_itext_ichar (init_str, XCHAR (character));
     Lisp_Object val = make_uninit_string (len * XINT (length));

     if (len == 1)
@@ -2158,11 +2158,11 @@
     else
       {
 	EMACS_INT i;
-	Intbyte *ptr = XSTRING_DATA (val);
+	Ibyte *ptr = XSTRING_DATA (val);

 	for (i = XINT (length); i; i--)
 	  {
-	    Intbyte *init_ptr = init_str;
+	    Ibyte *init_ptr = init_str;
 	    switch (len)
 	      {
 	      case 4: *ptr++ = *init_ptr++;
@@ -2182,14 +2182,14 @@
 */
        (int nargs, Lisp_Object *args))
 {
-  Intbyte *storage = alloca_array (Intbyte, nargs * MAX_EMCHAR_LEN);
-  Intbyte *p = storage;
+  Ibyte *storage = alloca_array (Ibyte, nargs * MAX_ICHAR_LEN);
+  Ibyte *p = storage;

   for (; nargs; nargs--, args++)
     {
       Lisp_Object lisp_char = *args;
       CHECK_CHAR_COERCE_INT (lisp_char);
-      p += set_charptr_emchar (p, XCHAR (lisp_char));
+      p += set_itext_ichar (p, XCHAR (lisp_char));
     }
   return make_string (storage, p - storage);
 }
@@ -2202,7 +2202,7 @@
 #ifdef MULE
   int i;
   Bytecount length = XSTRING_LENGTH (string);
-  Intbyte *contents = XSTRING_DATA (string);
+  Ibyte *contents = XSTRING_DATA (string);

   for (i = 0; i < length; i++)
     {
@@ -2220,7 +2220,7 @@
 /* Take some raw memory, which MUST already be in internal format,
    and package it up into a Lisp string. */
 Lisp_Object
-make_string (const Intbyte *contents, Bytecount length)
+make_string (const Ibyte *contents, Bytecount length)
 {
   Lisp_Object val;

@@ -2250,17 +2250,17 @@
 }

 Lisp_Object
-build_intstring (const Intbyte *str)
+build_intstring (const Ibyte *str)
 {
   /* Some strlen's crash and burn if passed null. */
   return make_string (str, (str ? qxestrlen (str) : (Bytecount) 0));
 }

 Lisp_Object
-build_string (const CIntbyte *str)
+build_string (const CIbyte *str)
 {
   /* Some strlen's crash and burn if passed null. */
-  return make_string ((const Intbyte *) str, (str ? strlen (str) : 0));
+  return make_string ((const Ibyte *) str, (str ? strlen (str) : 0));
 }

 Lisp_Object
@@ -2272,19 +2272,19 @@
 }

 Lisp_Object
-build_msg_intstring (const Intbyte *str)
+build_msg_intstring (const Ibyte *str)
 {
   return build_intstring (GETTEXT (str));
 }

 Lisp_Object
-build_msg_string (const CIntbyte *str)
+build_msg_string (const CIbyte *str)
 {
   return build_string (CGETTEXT (str));
 }

 Lisp_Object
-make_string_nocopy (const Intbyte *contents, Bytecount length)
+make_string_nocopy (const Ibyte *contents, Bytecount length)
 {
   Lisp_String *s;
   Lisp_Object val;
@@ -2299,7 +2299,7 @@
   set_lheader_implementation (&s->u.lheader, &lrecord_string);
   SET_C_READONLY_RECORD_HEADER (&s->u.lheader);
   s->plist = Qnil;
-  set_lispstringp_data (s, (Intbyte *) contents);
+  set_lispstringp_data (s, (Ibyte *) contents);
   set_lispstringp_length (s, length);
   val = wrap_string (s);
   init_string_ascii_begin (val);
@@ -3315,7 +3315,7 @@
   stderr_out ("\"");
   for (i = 0; i < s; i++)
   {
-    Emchar ch = string_emchar (p, i);
+    Ichar ch = string_ichar (p, i);
     if (ch < 32 || ch >= 126)
       stderr_out ("\\%03o", ch);
     else if (ch == '\\' || ch == '\"')
@@ -3656,7 +3656,7 @@
 		     build_msg_string (gc_default_message));
 	  args[1] = build_string ("...");
 	  whole_msg = Fconcat (2, args);
-	  echo_area_message (f, (Intbyte *) 0, whole_msg, 0, -1,
+	  echo_area_message (f, (Ibyte *) 0, whole_msg, 0, -1,
 			     Qgarbage_collecting);
 	}
     }
@@ -3819,7 +3819,7 @@
 			 build_msg_string (gc_default_message));
 	      args[1] = build_msg_string ("... done");
 	      whole_msg = Fconcat (2, args);
-	      echo_area_message (selected_frame (), (Intbyte *) 0,
+	      echo_area_message (selected_frame (), (Ibyte *) 0,
 				 whole_msg, 0, -1,
 				 Qgarbage_collecting);
 	    }
--- a/src/buffer.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/buffer.c	Wed Jun 05 09:58:45 2002 +0000
@@ -145,7 +145,7 @@
 /* This is the initial (startup) directory, as used for the *scratch* buffer.
    This is no longer global.  Use get_initial_directory() to retrieve it.
  */
-static Intbyte *initial_directory;
+static Ibyte *initial_directory;

 /* This structure holds the names of symbols whose values may be
    buffer-local.  It is indexed and accessed in the same way as the above. */
@@ -713,7 +713,7 @@
 {
   REGISTER Lisp_Object gentemp, tem;
   int count;
-  Intbyte number[10];
+  Ibyte number[10];

   CHECK_STRING (name);

@@ -2762,13 +2762,13 @@
 #ifndef WIN32_NATIVE
 /* Is PWD another name for `.' ? */
 static int
-directory_is_current_directory (Intbyte *pwd)
+directory_is_current_directory (Ibyte *pwd)
 {
   struct stat dotstat, pwdstat;

   return (IS_DIRECTORY_SEP (*pwd)
 	  && qxe_stat (pwd, &pwdstat) == 0
-	  && qxe_stat ((Intbyte *) ".", &dotstat) == 0
+	  && qxe_stat ((Ibyte *) ".", &dotstat) == 0
 	  && dotstat.st_ino == pwdstat.st_ino
 	  && dotstat.st_dev == pwdstat.st_dev);
 }
@@ -2776,8 +2776,8 @@

 /* A stand-in for getcwd() #### Fix not to depend on arbitrary size limits */

-Intbyte *
-get_initial_directory (Intbyte *pathname, Bytecount size)
+Ibyte *
+get_initial_directory (Ibyte *pathname, Bytecount size)
 {
   if (pathname)
     {
@@ -2793,7 +2793,7 @@
   /* This function can GC */

 #ifndef WIN32_NATIVE
-  Intbyte *pwd;
+  Ibyte *pwd;
 #endif

   /* If PWD is accurate, use it instead of calling getcwd.  This is faster
@@ -2806,7 +2806,7 @@
 #endif
     if ((initial_directory = qxe_allocating_getcwd ()) == NULL)
       {
-	Intbyte *errmess;
+	Ibyte *errmess;
 	GET_STRERROR (errmess, errno);
 	fatal ("`getcwd' failed: %s\n", errmess);
       }
@@ -2819,7 +2819,7 @@

     if (! IS_DIRECTORY_SEP (initial_directory[len - 1]))
       {
-	XREALLOC_ARRAY (initial_directory, Intbyte, len + 2);
+	XREALLOC_ARRAY (initial_directory, Ibyte, len + 2);
 	initial_directory[len] = DIRECTORY_SEP;
 	initial_directory[len + 1] = '\0';
       }
@@ -2827,7 +2827,7 @@

 #ifdef WIN32_NATIVE
   {
-    Intbyte *newinit = mswindows_canonicalize_filename (initial_directory);
+    Ibyte *newinit = mswindows_canonicalize_filename (initial_directory);
     xfree (initial_directory);
     initial_directory = newinit;
   }
--- a/src/buffer.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/buffer.h	Wed Jun 05 09:58:45 2002 +0000
@@ -76,7 +76,7 @@

 struct buffer_text
 {
-  Intbyte *beg;		/* Actual address of buffer contents. */
+  Ibyte *beg;		/* Actual address of buffer contents. */
   Bytebpos gpt;		/* Index of gap in buffer. */
   Bytebpos z;		/* Index of end of buffer. */
   Charbpos bufz;		/* Equivalent as a Charbpos. */
@@ -329,7 +329,7 @@

 /* Address of byte at position POS in buffer, no error checking. */
 DECLARE_INLINE_HEADER (
-Intbyte *
+Ibyte *
 BYTE_BUF_BYTE_ADDRESS_NO_VERIFY (struct buffer *buf, Bytebpos pos)
 )
 {
@@ -349,7 +349,7 @@
   switch (BUF_FORMAT (buf))
     {
     case FORMAT_DEFAULT:
-      return intbyte_first_byte_p (*BYTE_BUF_BYTE_ADDRESS_NO_VERIFY (buf, x));
+      return ibyte_first_byte_p (*BYTE_BUF_BYTE_ADDRESS_NO_VERIFY (buf, x));
     case FORMAT_16_BIT_FIXED:
       return ((x - 1) & 1) == 0;
     case FORMAT_32_BIT_FIXED:
@@ -413,8 +413,8 @@
     {									\
     case FORMAT_DEFAULT:						\
       {									\
-	Intbyte *VBB_ptr = BYTE_BUF_BYTE_ADDRESS_NO_VERIFY (buf, x);	\
-	while (!intbyte_first_byte_p (*VBB_ptr))			\
+	Ibyte *VBB_ptr = BYTE_BUF_BYTE_ADDRESS_NO_VERIFY (buf, x);	\
+	while (!ibyte_first_byte_p (*VBB_ptr))			\
 	  VBB_ptr--, (x)--;						\
       }									\
       break;								\
@@ -445,8 +445,8 @@
     {									\
     case FORMAT_DEFAULT:						\
       {									\
-	Intbyte *VBF_ptr = BYTE_BUF_BYTE_ADDRESS_NO_VERIFY (buf, x);	\
-	while (!intbyte_first_byte_p (*VBF_ptr))			\
+	Ibyte *VBF_ptr = BYTE_BUF_BYTE_ADDRESS_NO_VERIFY (buf, x);	\
+	while (!ibyte_first_byte_p (*VBF_ptr))			\
 	  VBF_ptr++, (x)++;						\
       }									\
       break;								\
@@ -491,7 +491,7 @@

 /*  Given a byte position (assumed to point at the beginning of a
     character), modify that value so it points to the beginning of the
-    previous character.  Unlike for DEC_CHARPTR(), we can do all the
+    previous character.  Unlike for DEC_IBYTEPTR(), we can do all the
     assert()s because there are sentinels at the beginning of the gap and
     the end of the buffer.

@@ -826,7 +826,7 @@
 /* Convert the address of a byte in the buffer into a position.  */
 DECLARE_INLINE_HEADER (
 Bytebpos
-BYTE_BUF_PTR_BYTE_POS (struct buffer *buf, Intbyte *ptr)
+BYTE_BUF_PTR_BYTE_POS (struct buffer *buf, Ibyte *ptr)
 )
 {
   Bytebpos retval = (ptr - buf->text->beg + 1
@@ -841,7 +841,7 @@

 /* Address of byte at position POS in buffer. */
 DECLARE_INLINE_HEADER (
-Intbyte *
+Ibyte *
 BYTE_BUF_BYTE_ADDRESS (struct buffer *buf, Bytebpos pos)
 )
 {
@@ -854,7 +854,7 @@

 /* Address of byte before position POS in buffer. */
 DECLARE_INLINE_HEADER (
-Intbyte *
+Ibyte *
 BYTE_BUF_BYTE_ADDRESS_BEFORE (struct buffer *buf, Bytebpos pos)
 )
 {
@@ -874,29 +874,29 @@
 /* The character at position POS in buffer. */

 #define BYTE_BUF_FETCH_CHAR(buf, pos)					   \
-   charptr_emchar_fmt (BYTE_BUF_BYTE_ADDRESS (buf, pos), BUF_FORMAT (buf), \
+   itext_ichar_fmt (BYTE_BUF_BYTE_ADDRESS (buf, pos), BUF_FORMAT (buf), \
 		       wrap_buffer (buf))
 #define BUF_FETCH_CHAR(buf, pos) \
   BYTE_BUF_FETCH_CHAR (buf, charbpos_to_bytebpos (buf, pos))

 /* The "raw value" of the character at position POS in buffer.
-   See emchar_to_raw(). */
+   See ichar_to_raw(). */

 #define BYTE_BUF_FETCH_CHAR_RAW(buf, pos)				 \
-   charptr_emchar_raw_fmt (BYTE_BUF_BYTE_ADDRESS (buf, pos), BUF_FORMAT (buf))
+   itext_ichar_raw_fmt (BYTE_BUF_BYTE_ADDRESS (buf, pos), BUF_FORMAT (buf))
 #define BUF_FETCH_CHAR_RAW(buf, pos) \
   BYTE_BUF_FETCH_CHAR_RAW (buf, charbpos_to_bytebpos (buf, pos))

 /* The character at position POS in buffer, as a string.  This is
-   equivalent to set_charptr_emchar (str, BUF_FETCH_CHAR (buf, pos))
+   equivalent to set_itext_ichar (str, BUF_FETCH_CHAR (buf, pos))
    but is faster for Mule. */

-# define BYTE_BUF_CHARPTR_COPY_EMCHAR(buf, pos, str)		\
+# define BYTE_BUF_ITEXT_COPY_ICHAR(buf, pos, str)		\
   (BUF_FORMAT (buf) == FORMAT_DEFAULT ?				\
-   charptr_copy_emchar (BYTE_BUF_BYTE_ADDRESS (buf, pos), str) :	\
-   set_charptr_emchar (str, BYTE_BUF_FETCH_CHAR (buf, pos)))
-#define BUF_CHARPTR_COPY_EMCHAR(buf, pos, str) \
-  BYTE_BUF_CHARPTR_COPY_EMCHAR (buf, charbpos_to_bytebpos (buf, pos), str)
+   itext_copy_ichar (BYTE_BUF_BYTE_ADDRESS (buf, pos), str) :	\
+   set_itext_ichar (str, BYTE_BUF_FETCH_CHAR (buf, pos)))
+#define BUF_ITEXT_COPY_ICHAR(buf, pos, str) \
+  BYTE_BUF_ITEXT_COPY_ICHAR (buf, charbpos_to_bytebpos (buf, pos), str)


 /************************************************************************/
@@ -1059,7 +1059,7 @@
       {
 	Bytebpos ceil = BYTE_BUF_CEILING_OF (buf, pos);
 	ceil = min (to, ceil);
-	process_intbyte_string (BYTE_BUF_BYTE_ADDRESS (buf, pos), ceil - pos);
+	process_ibyte_string (BYTE_BUF_BYTE_ADDRESS (buf, pos), ceil - pos);
 	pos = ceil;
       }
   }
@@ -1115,7 +1115,7 @@
    NOTE: This must be surrounded with braces! */

 #define BUFFER_TEXT_LOOP(buf, pos, len, runptr, runlen)			      \
-Intbyte *runptr;							      \
+Ibyte *runptr;							      \
 Bytecount runlen;							      \
 Bytebpos BTL_pos = (pos);						      \
 Bytebpos BTL_len = (len);						      \
@@ -1154,18 +1154,18 @@
 void r_alloc_free (unsigned char **);

 #define BUFFER_ALLOC(data, size) \
-  ((Intbyte *) r_alloc ((unsigned char **) &data, (size) * sizeof(Intbyte)))
+  ((Ibyte *) r_alloc ((unsigned char **) &data, (size) * sizeof(Ibyte)))
 #define BUFFER_REALLOC(data, size) \
-  ((Intbyte *) r_re_alloc ((unsigned char **) &data, (size) * sizeof(Intbyte)))
+  ((Ibyte *) r_re_alloc ((unsigned char **) &data, (size) * sizeof(Ibyte)))
 #define BUFFER_FREE(data) r_alloc_free ((unsigned char **) &(data))
 #define R_ALLOC_DECLARE(var,data) r_alloc_declare (&(var), data)

 #else /* !REL_ALLOC */

 #define BUFFER_ALLOC(data,size)\
-	(data = xnew_array (Intbyte, size))
+	(data = xnew_array (Ibyte, size))
 #define BUFFER_REALLOC(data,size)\
-	((Intbyte *) xrealloc (data, (size) * sizeof(Intbyte)))
+	((Ibyte *) xrealloc (data, (size) * sizeof(Ibyte)))
 /* Avoid excess parentheses, or syntax errors may rear their heads. */
 #define BUFFER_FREE(data) xfree (data)
 #define R_ALLOC_DECLARE(var,data)
@@ -1187,8 +1187,8 @@

 #define MAKE_TRT_TABLE() Fmake_char_table (Qgeneric)
 DECLARE_INLINE_HEADER (
-Emchar
-TRT_TABLE_OF (Lisp_Object table, Emchar ch)
+Ichar
+TRT_TABLE_OF (Lisp_Object table, Ichar ch)
 )
 {
   Lisp_Object TRT_char;
@@ -1219,7 +1219,7 @@

 DECLARE_INLINE_HEADER (
 int
-UPPERCASEP (struct buffer *buf, Emchar ch)
+UPPERCASEP (struct buffer *buf, Ichar ch)
 )
 {
   return DOWNCASE_TABLE_OF (buf, ch) != ch;
@@ -1229,7 +1229,7 @@

 DECLARE_INLINE_HEADER (
 int
-LOWERCASEP (struct buffer *buf, Emchar ch)
+LOWERCASEP (struct buffer *buf, Ichar ch)
 )
 {
   return (UPCASE_TABLE_OF   (buf, ch) != ch &&
@@ -1240,7 +1240,7 @@

 DECLARE_INLINE_HEADER (
 int
-NOCASEP (struct buffer *buf, Emchar ch)
+NOCASEP (struct buffer *buf, Ichar ch)
 )
 {
   return UPCASE_TABLE_OF (buf, ch) == ch;
@@ -1249,8 +1249,8 @@
 /* Upcase a character, or make no change if that cannot be done.  */

 DECLARE_INLINE_HEADER (
-Emchar
-UPCASE (struct buffer *buf, Emchar ch)
+Ichar
+UPCASE (struct buffer *buf, Ichar ch)
 )
 {
   return (DOWNCASE_TABLE_OF (buf, ch) == ch) ? UPCASE_TABLE_OF (buf, ch) : ch;
--- a/src/bytecode.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/bytecode.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1410,7 +1410,7 @@


 DOESNT_RETURN
-invalid_byte_code (const CIntbyte *reason, Lisp_Object frob)
+invalid_byte_code (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qinvalid_byte_code, reason, frob);
 }
@@ -1439,8 +1439,8 @@

 /* Get next character from Lisp instructions string. */
 #define READ_INSTRUCTION_CHAR(lvalue) do {				\
-  (lvalue) = charptr_emchar (ptr);					\
-  INC_CHARPTR (ptr);							\
+  (lvalue) = itext_ichar (ptr);					\
+  INC_IBYTEPTR (ptr);							\
   *icounts_ptr++ = program_ptr - program;				\
   if (lvalue > UCHAR_MAX)						\
     invalid_byte_code							\
@@ -1546,8 +1546,8 @@

   Opbyte *program_ptr = program;

-  const Intbyte *ptr = XSTRING_DATA (instructions);
-  const Intbyte * const end = ptr + instructions_length;
+  const Ibyte *ptr = XSTRING_DATA (instructions);
+  const Ibyte * const end = ptr + instructions_length;

   *varbind_count = 0;

@@ -1994,9 +1994,9 @@
     /* Invert action performed by optimize_byte_code() */
     Lisp_Opaque *opaque = XOPAQUE (f->instructions);

-    Intbyte * const buffer =
-      alloca_array (Intbyte, OPAQUE_SIZE (opaque) * MAX_EMCHAR_LEN);
-    Intbyte *bp = buffer;
+    Ibyte * const buffer =
+      alloca_array (Ibyte, OPAQUE_SIZE (opaque) * MAX_ICHAR_LEN);
+    Ibyte *bp = buffer;

     const Opbyte * const program = (const Opbyte *) OPAQUE_DATA (opaque);
     const Opbyte *program_ptr = program;
@@ -2005,7 +2005,7 @@
     while (program_ptr < program_end)
       {
 	Opcode opcode = (Opcode) READ_UINT_1;
-	bp += set_charptr_emchar (bp, opcode);
+	bp += set_itext_ichar (bp, opcode);
 	switch (opcode)
 	  {
 	  case Bvarref+7:
@@ -2014,8 +2014,8 @@
 	  case Bcall+7:
 	  case Bunbind+7:
 	  case Bconstant2:
-	    bp += set_charptr_emchar (bp, READ_UINT_1);
-	    bp += set_charptr_emchar (bp, READ_UINT_1);
+	    bp += set_itext_ichar (bp, READ_UINT_1);
+	    bp += set_itext_ichar (bp, READ_UINT_1);
 	    break;

 	  case Bvarref+6:
@@ -2026,7 +2026,7 @@
 	  case BlistN:
 	  case BconcatN:
 	  case BinsertN:
-	    bp += set_charptr_emchar (bp, READ_UINT_1);
+	    bp += set_itext_ichar (bp, READ_UINT_1);
 	    break;

 	  case Bgoto:
@@ -2040,8 +2040,8 @@
 	      Opbyte *buf2p = buf2;
 	      /* Convert back to program-relative address */
 	      WRITE_INT16 (jump + (program_ptr - 2 - program), buf2p);
-	      bp += set_charptr_emchar (bp, buf2[0]);
-	      bp += set_charptr_emchar (bp, buf2[1]);
+	      bp += set_itext_ichar (bp, buf2[0]);
+	      bp += set_itext_ichar (bp, buf2[1]);
 	      break;
 	    }

@@ -2050,7 +2050,7 @@
 	  case BRgotoifnonnil:
 	  case BRgotoifnilelsepop:
 	  case BRgotoifnonnilelsepop:
-	    bp += set_charptr_emchar (bp, READ_INT_1 + 127);
+	    bp += set_itext_ichar (bp, READ_INT_1 + 127);
 	    break;

 	  default:
--- a/src/callint.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/callint.c	Wed Jun 05 09:58:45 2002 +0000
@@ -258,7 +258,7 @@
 }

 static Lisp_Object
-callint_prompt (const Intbyte *prompt_start, Bytecount prompt_length,
+callint_prompt (const Ibyte *prompt_start, Bytecount prompt_length,
                 const Lisp_Object *args, int nargs)
 {
   Lisp_Object s = make_string (prompt_start, prompt_length);
@@ -645,7 +645,7 @@
 	   prompts with "Set key C-x C-f to command: "instead of printing
 	   event objects in there.
 	 */
-#define PROMPT() callint_prompt ((const Intbyte *) prompt_start, prompt_length, visargs, argnum)
+#define PROMPT() callint_prompt ((const Ibyte *) prompt_start, prompt_length, visargs, argnum)
 	switch (prompt_data[prompt_index])
 	  {
 	  case 'a':		/* Symbol defined as a function */
--- a/src/casefiddle.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/casefiddle.c	Wed Jun 05 09:58:45 2002 +0000
@@ -40,7 +40,7 @@

   if (CHAR_OR_CHAR_INTP (string_or_char))
     {
-      Emchar c;
+      Ichar c;
       CHECK_CHAR_COERCE_INT (string_or_char);
       c = XCHAR (string_or_char);
       c = (flag == CASE_DOWN) ? DOWNCASE (buf, c) : UPCASE (buf, c);
@@ -50,17 +50,17 @@
   if (STRINGP (string_or_char))
     {
       Lisp_Object syntax_table = buf->mirror_syntax_table;
-      Intbyte *storage =
-	alloca_array (Intbyte, XSTRING_LENGTH (string_or_char) *
-		      MAX_EMCHAR_LEN);
-      Intbyte *newp = storage;
-      Intbyte *oldp = XSTRING_DATA (string_or_char);
-      Intbyte *endp = oldp + XSTRING_LENGTH (string_or_char);
+      Ibyte *storage =
+	alloca_array (Ibyte, XSTRING_LENGTH (string_or_char) *
+		      MAX_ICHAR_LEN);
+      Ibyte *newp = storage;
+      Ibyte *oldp = XSTRING_DATA (string_or_char);
+      Ibyte *endp = oldp + XSTRING_LENGTH (string_or_char);
       int wordp = 0, wordp_prev;

       while (oldp < endp)
 	{
-	  Emchar c = charptr_emchar (oldp);
+	  Ichar c = itext_ichar (oldp);
 	  switch (flag)
 	    {
 	    case CASE_UP:
@@ -84,8 +84,8 @@
 	      break;
 	    }

-	  newp += set_charptr_emchar (newp, c);
-	  INC_CHARPTR (oldp);
+	  newp += set_itext_ichar (newp, c);
+	  INC_IBYTEPTR (oldp);
 	}

       return make_string (storage, newp - storage);
@@ -173,8 +173,8 @@

   for (pos = s; pos < e; pos++)
     {
-      Emchar oldc = BUF_FETCH_CHAR (buf, pos);
-      Emchar c = oldc;
+      Ichar oldc = BUF_FETCH_CHAR (buf, pos);
+      Ichar c = oldc;

       switch (flag)
 	{
--- a/src/casetab.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/casetab.c	Wed Jun 05 09:58:45 2002 +0000
@@ -312,11 +312,11 @@
 			  Lisp_Object table, Lisp_Object val, void *arg)
 {
   Lisp_Object inverse = VOID_TO_LISP (arg);
-  Emchar toch = XCHAR (val);
+  Ichar toch = XCHAR (val);

   if (range->type == CHARTAB_RANGE_CHAR && range->ch != toch)
     {
-      Emchar c = TRT_TABLE_OF (inverse, toch);
+      Ichar c = TRT_TABLE_OF (inverse, toch);
       SET_TRT_TABLE_OF (inverse, toch, range->ch);
       SET_TRT_TABLE_OF (inverse, range->ch, c);
     }
@@ -372,10 +372,10 @@
 static void
 convert_old_style_syntax_string (Lisp_Object table, Lisp_Object string)
 {
-  Emchar i;
+  Ichar i;

   for (i = 0; i < 256; i++)
-    SET_TRT_TABLE_OF (table, i, string_emchar (string, i));
+    SET_TRT_TABLE_OF (table, i, string_ichar (string, i));
 }

 static Lisp_Object
@@ -511,7 +511,7 @@
 void
 complex_vars_of_casetab (void)
 {
-  REGISTER Emchar i;
+  REGISTER Ichar i;

   staticpro (&Vstandard_case_table);
--- a/src/charset.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/charset.h	Wed Jun 05 09:58:45 2002 +0000
@@ -40,10 +40,10 @@

 #define Vcharset_ascii Qnil

-#define emchar_charset(ch) Vcharset_ascii
-#define emchar_leading_byte(ch) LEADING_BYTE_ASCII
-#define emchar_len(ch) 1
-#define emchar_len_fmt(ch, fmt) 1
+#define ichar_charset(ch) Vcharset_ascii
+#define ichar_leading_byte(ch) LEADING_BYTE_ASCII
+#define ichar_len(ch) 1
+#define ichar_len_fmt(ch, fmt) 1
 #define LEADING_BYTE_ASCII 0x80
 #define NUM_LEADING_BYTES 1
 #define MIN_LEADING_BYTE 0x80
@@ -53,7 +53,7 @@
 #define XCHARSET_GRAPHIC(cs) -1
 #define XCHARSET_COLUMNS(cs) 1
 #define XCHARSET_DIMENSION(cs) 1
-#define BREAKUP_EMCHAR(ch, charset, byte1, byte2) do {	\
+#define BREAKUP_ICHAR(ch, charset, byte1, byte2) do {	\
   (charset) = Vcharset_ascii;				\
   (byte1) = (ch);					\
   (byte2) = 0;						\
@@ -159,7 +159,7 @@

 DECLARE_INLINE_HEADER (
 int
-leading_byte_prefix_p (Intbyte lb)
+leading_byte_prefix_p (Ibyte lb)
 )
 {
   return (lb == PRE_LEADING_BYTE_PRIVATE_1 ||
@@ -228,7 +228,7 @@
   unsigned char unicode_table_loaded;

   /* Final byte of this character set in ISO2022 designating escape sequence */
-  Intbyte final;
+  Ibyte final;

   /* Number of bytes (1 - 4) required in the internal representation
      for characters in this character set.  This is *not* the
@@ -279,7 +279,7 @@

 /* Leading byte and id have been regrouped. -- OG */
 #define CHARSET_ID(cs)		 ((cs)->id)
-#define CHARSET_LEADING_BYTE(cs) ((Intbyte) CHARSET_ID (cs))
+#define CHARSET_LEADING_BYTE(cs) ((Ibyte) CHARSET_ID (cs))
 #define CHARSET_NAME(cs)	 ((cs)->name)
 #define CHARSET_SHORT_NAME(cs)	 ((cs)->short_name)
 #define CHARSET_LONG_NAME(cs)	 ((cs)->long_name)
@@ -335,8 +335,8 @@

   /* Table of charsets indexed by type/final-byte/direction. */
   Lisp_Object charset_by_attributes[4][128][2];
-  Intbyte next_allocated_1_byte_leading_byte;
-  Intbyte next_allocated_2_byte_leading_byte;
+  Ibyte next_allocated_1_byte_leading_byte;
+  Ibyte next_allocated_2_byte_leading_byte;
 };

 DECLARE_INLINE_HEADER (
@@ -376,15 +376,15 @@
 /* The bit fields of character are divided into 3 parts:
    FIELD1(5bits):FIELD2(7bits):FIELD3(7bits) */

-#define EMCHAR_FIELD1_MASK (0x1F << 14)
-#define EMCHAR_FIELD2_MASK (0x7F << 7)
-#define EMCHAR_FIELD3_MASK 0x7F
+#define ICHAR_FIELD1_MASK (0x1F << 14)
+#define ICHAR_FIELD2_MASK (0x7F << 7)
+#define ICHAR_FIELD3_MASK 0x7F

 /* Macros to access each field of a character code of C.  */

-#define emchar_field1(c) (((c) & EMCHAR_FIELD1_MASK) >> 14)
-#define emchar_field2(c) (((c) & EMCHAR_FIELD2_MASK) >> 7)
-#define emchar_field3(c)  ((c) & EMCHAR_FIELD3_MASK)
+#define ichar_field1(c) (((c) & ICHAR_FIELD1_MASK) >> 14)
+#define ichar_field2(c) (((c) & ICHAR_FIELD2_MASK) >> 7)
+#define ichar_field3(c)  ((c) & ICHAR_FIELD3_MASK)

 /* Field 1, if non-zero, usually holds a leading byte for a
    dimension-2 charset.  Field 2, if non-zero, usually holds a leading
@@ -400,32 +400,32 @@

 /* Minimum and maximum allowed values for the fields. */

-#define MIN_EMCHAR_FIELD2_OFFICIAL \
+#define MIN_ICHAR_FIELD2_OFFICIAL \
   (MIN_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE)
-#define MAX_EMCHAR_FIELD2_OFFICIAL \
+#define MAX_ICHAR_FIELD2_OFFICIAL \
   (MAX_LEADING_BYTE_OFFICIAL_1 - FIELD2_TO_OFFICIAL_LEADING_BYTE)

-#define MIN_EMCHAR_FIELD1_OFFICIAL \
+#define MIN_ICHAR_FIELD1_OFFICIAL \
   (MIN_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE)
-#define MAX_EMCHAR_FIELD1_OFFICIAL \
+#define MAX_ICHAR_FIELD1_OFFICIAL \
   (MAX_LEADING_BYTE_OFFICIAL_2 - FIELD1_TO_OFFICIAL_LEADING_BYTE)

-#define MIN_EMCHAR_FIELD2_PRIVATE \
+#define MIN_ICHAR_FIELD2_PRIVATE \
   (MIN_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE)
-#define MAX_EMCHAR_FIELD2_PRIVATE \
+#define MAX_ICHAR_FIELD2_PRIVATE \
   (MAX_LEADING_BYTE_PRIVATE_1 - FIELD2_TO_PRIVATE_LEADING_BYTE)

-#define MIN_EMCHAR_FIELD1_PRIVATE \
+#define MIN_ICHAR_FIELD1_PRIVATE \
   (MIN_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE)
-#define MAX_EMCHAR_FIELD1_PRIVATE \
+#define MAX_ICHAR_FIELD1_PRIVATE \
   (MAX_LEADING_BYTE_PRIVATE_2 - FIELD1_TO_PRIVATE_LEADING_BYTE)

 /* Minimum character code of each <type> character.  */

-#define MIN_CHAR_OFFICIAL_TYPE9N    (MIN_EMCHAR_FIELD2_OFFICIAL <<  7)
-#define MIN_CHAR_PRIVATE_TYPE9N     (MIN_EMCHAR_FIELD2_PRIVATE  <<  7)
-#define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_EMCHAR_FIELD1_OFFICIAL << 14)
-#define MIN_CHAR_PRIVATE_TYPE9NX9N  (MIN_EMCHAR_FIELD1_PRIVATE  << 14)
+#define MIN_CHAR_OFFICIAL_TYPE9N    (MIN_ICHAR_FIELD2_OFFICIAL <<  7)
+#define MIN_CHAR_PRIVATE_TYPE9N     (MIN_ICHAR_FIELD2_PRIVATE  <<  7)
+#define MIN_CHAR_OFFICIAL_TYPE9NX9N (MIN_ICHAR_FIELD1_OFFICIAL << 14)
+#define MIN_CHAR_PRIVATE_TYPE9NX9N  (MIN_ICHAR_FIELD1_PRIVATE  << 14)
 #define MIN_CHAR_COMPOSITION        (0x1F << 14)

 /* Leading byte of a character.
@@ -436,20 +436,20 @@
    */

 DECLARE_INLINE_HEADER (
-Intbyte
-emchar_leading_byte (Emchar c)
+Ibyte
+ichar_leading_byte (Ichar c)
 )
 {
-  if (emchar_ascii_p (c))
+  if (ichar_ascii_p (c))
     return LEADING_BYTE_ASCII;
   else if (c < 0xA0)
     return LEADING_BYTE_CONTROL_1;
   else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N)
-    return emchar_field2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE;
+    return ichar_field2 (c) + FIELD2_TO_OFFICIAL_LEADING_BYTE;
   else if (c < MIN_CHAR_PRIVATE_TYPE9NX9N)
-    return emchar_field1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE;
+    return ichar_field1 (c) + FIELD1_TO_OFFICIAL_LEADING_BYTE;
   else if (c < MIN_CHAR_COMPOSITION)
-    return emchar_field1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE;
+    return ichar_field1 (c) + FIELD1_TO_PRIVATE_LEADING_BYTE;
   else
     {
 #ifdef ENABLE_COMPOSITE_CHARS
@@ -463,10 +463,10 @@

 DECLARE_INLINE_HEADER (
 Bytecount
-emchar_len (Emchar c)
+ichar_len (Ichar c)
 )
 {
-  if (emchar_ascii_p (c))
+  if (ichar_ascii_p (c))
     return 1;
   else if (c < MIN_CHAR_OFFICIAL_TYPE9NX9N)
     return 2;
@@ -487,13 +487,13 @@

 DECLARE_INLINE_HEADER (
 Bytecount
-emchar_len_fmt (Emchar c, Internal_Format fmt)
+ichar_len_fmt (Ichar c, Internal_Format fmt)
 )
 {
   switch (fmt)
     {
     case FORMAT_DEFAULT:
-      return emchar_len (c);
+      return ichar_len (c);
     case FORMAT_16_BIT_FIXED:
       return 2;
     case FORMAT_32_BIT_FIXED:
@@ -504,7 +504,7 @@
     }
 }

-#define emchar_charset(c) charset_by_leading_byte (emchar_leading_byte (c))
+#define ichar_charset(c) charset_by_leading_byte (ichar_leading_byte (c))

 /* Return a character whose charset is CHARSET and position-codes are C1
    and C2.  TYPE9N character ignores C2. (For typical charsets, i.e. not
@@ -517,11 +517,11 @@
    */

 DECLARE_INLINE_HEADER (
-Emchar
-make_emchar (Lisp_Object charset, int c1, int c2)
+Ichar
+make_ichar (Lisp_Object charset, int c1, int c2)
 )
 {
-  Emchar retval;
+  Ichar retval;
   if (EQ (charset, Vcharset_ascii))
     retval = c1;
   else if (EQ (charset, Vcharset_control_1))
@@ -539,40 +539,40 @@
   else
     retval = ((XCHARSET_LEADING_BYTE (charset) -
 	       FIELD1_TO_PRIVATE_LEADING_BYTE) << 14) | ((c1) << 7) | (c2);
-  text_checking_assert (valid_emchar_p (retval));
+  text_checking_assert (valid_ichar_p (retval));
   return retval;
 }

-/* BREAKUP_EMCHAR_1_UNSAFE assumes that the charset has already been
+/* BREAKUP_ICHAR_1_UNSAFE assumes that the charset has already been
    calculated, and just computes c1 and c2.

-   BREAKUP_EMCHAR also computes and stores the charset. */
+   BREAKUP_ICHAR also computes and stores the charset. */

-#define BREAKUP_EMCHAR_1_UNSAFE(c, charset, c1, c2)	\
+#define BREAKUP_ICHAR_1_UNSAFE(c, charset, c1, c2)	\
   XCHARSET_DIMENSION (charset) == 1			\
-  ? ((c1) = emchar_field3 (c), (c2) = 0)		\
-  : ((c1) = emchar_field2 (c),				\
-     (c2) = emchar_field3 (c))
+  ? ((c1) = ichar_field3 (c), (c2) = 0)		\
+  : ((c1) = ichar_field2 (c),				\
+     (c2) = ichar_field3 (c))

 DECLARE_INLINE_HEADER (
 void
-breakup_emchar_1 (Emchar c, Lisp_Object *charset, int *c1, int *c2)
+breakup_ichar_1 (Ichar c, Lisp_Object *charset, int *c1, int *c2)
 )
 {
-  text_checking_assert (valid_emchar_p (c));
-  *charset = emchar_charset (c);
-  BREAKUP_EMCHAR_1_UNSAFE (c, *charset, *c1, *c2);
+  text_checking_assert (valid_ichar_p (c));
+  *charset = ichar_charset (c);
+  BREAKUP_ICHAR_1_UNSAFE (c, *charset, *c1, *c2);
 }

-/* BREAKUP_EMCHAR separates an Emchar into its components.  The charset of
+/* BREAKUP_ICHAR separates an Ichar into its components.  The charset of
    character C is set to CHARSET, and the position-codes of C are set to C1
    and C2.  C2 of TYPE9N character is 0.  */

-#define BREAKUP_EMCHAR(c, charset, c1, c2) \
-  breakup_emchar_1 (c, &(charset), &(c1), &(c2))
+#define BREAKUP_ICHAR(c, charset, c1, c2) \
+  breakup_ichar_1 (c, &(charset), &(c1), &(c2))

 void get_charset_limits (Lisp_Object charset, int *low, int *high);
-int emchar_to_unicode (Emchar chr);
+int ichar_to_unicode (Ichar chr);

 #endif /* MULE */
--- a/src/chartab.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/chartab.c	Wed Jun 05 09:58:45 2002 +0000
@@ -691,13 +691,13 @@
 /* called from get_char_table(). */
 Lisp_Object
 get_non_ascii_char_table_value (Lisp_Char_Table *ct, int leading_byte,
-				Emchar c)
+				Ichar c)
 {
   Lisp_Object val;
   Lisp_Object charset = charset_by_leading_byte (leading_byte);
   int byte1, byte2;

-  BREAKUP_EMCHAR_1_UNSAFE (c, charset, byte1, byte2);
+  BREAKUP_ICHAR_1_UNSAFE (c, charset, byte1, byte2);
   val = ct->level1[leading_byte - MIN_LEADING_BYTE];
   if (CHAR_TABLE_ENTRYP (val))
     {
@@ -1026,7 +1026,7 @@
 	Lisp_Object charset;
 	int byte1, byte2;

-	BREAKUP_EMCHAR (range->ch, charset, byte1, byte2);
+	BREAKUP_ICHAR (range->ch, charset, byte1, byte2);
 	if (EQ (charset, Vcharset_ascii))
 	  ct->ascii[byte1] = val;
 	else if (EQ (charset, Vcharset_control_1))
@@ -1137,7 +1137,7 @@

   for (i = start, retval = 0; i <= stop && retval == 0; i++)
     {
-      rainj.ch = (Emchar) i;
+      rainj.ch = (Ichar) i;
       if (!UNBOUNDP (ct->ascii[i]))
 	retval = (fn) (&rainj, wrap_char_table (ct), ct->ascii[i], arg);
     }
@@ -1218,7 +1218,7 @@

       for (i = start, retval = 0; i <= stop && retval == 0; i++)
 	{
-	  rainj.ch = make_emchar (charset, row, i);
+	  rainj.ch = make_ichar (charset, row, i);
 	  if (!UNBOUNDP (cte->level2[i - 32]))
 	    retval = (fn) (&rainj, wrap_char_table (ct), cte->level2[i - 32],
 			   arg);
@@ -1266,7 +1266,7 @@

 	for (i = start, retval = 0; i <= stop && retval == 0; i++)
 	  {
-	    rainj.ch = make_emchar (charset, i, 0);
+	    rainj.ch = make_ichar (charset, i, 0);
 	    if (!UNBOUNDP (cte->level2[i - 32]))
 	      retval = (fn) (&rainj, wrap_char_table (ct), cte->level2[i - 32],
 			     arg);
@@ -1358,7 +1358,7 @@

     case CHARTAB_RANGE_CHAR:
       {
-	Emchar ch = range->ch;
+	Ichar ch = range->ch;
 	Lisp_Object val = get_char_table (ch, table);
 	struct chartab_range rainj;

@@ -1505,9 +1505,9 @@
         {
 	  if (CHAR_OR_CHAR_INTP (XCAR (range)))
 	    {
-	      Emchar first = XCHAR_OR_CHAR_INT (Fcar (range));
-	      Emchar last = XCHAR_OR_CHAR_INT (Fcar (Fcdr (range)));
-	      Emchar i;
+	      Ichar first = XCHAR_OR_CHAR_INT (Fcar (range));
+	      Ichar last = XCHAR_OR_CHAR_INT (Fcar (Fcdr (range)));
+	      Ichar i;

 	      for (i = first; i <= last; i++)
 		 Fput_char_table (make_char (i), val, chartab);
@@ -1571,7 +1571,7 @@
 }

 int
-check_category_char (Emchar ch, Lisp_Object table,
+check_category_char (Ichar ch, Lisp_Object table,
 		     int designator, int not_p)
 {
   REGISTER Lisp_Object temp;
@@ -1595,7 +1595,7 @@
        (position, designator, buffer, category_table))
 {
   Lisp_Object ctbl;
-  Emchar ch;
+  Ichar ch;
   int des;
   struct buffer *buf = decode_buffer (buffer, 0);

@@ -1615,7 +1615,7 @@
        (character, designator, category_table))
 {
   Lisp_Object ctbl;
-  Emchar ch;
+  Ichar ch;
   int des;

   CHECK_CATEGORY_DESIGNATOR (designator);
@@ -1706,7 +1706,7 @@
    directly.  */

 int
-word_boundary_p (Emchar c1, Emchar c2)
+word_boundary_p (Ichar c1, Ichar c2)
 {
   Lisp_Object category_set1, category_set2;
   Lisp_Object tail;
@@ -1719,7 +1719,7 @@
     c2 = cmpchar_component (c2, 0, 1);
 #endif

-  if (EQ (emchar_charset (c1), emchar_charset (c2)))
+  if (EQ (ichar_charset (c1), ichar_charset (c2)))
     {
       tail = Vword_separating_categories;
       default_result = 0;
--- a/src/chartab.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/chartab.h	Wed Jun 05 09:58:45 2002 +0000
@@ -136,11 +136,11 @@

 Lisp_Object get_non_ascii_char_table_value (Lisp_Char_Table *ct,
 					    int leading_byte,
-					    Emchar c);
+					    Ichar c);

 DECLARE_INLINE_HEADER (
 Lisp_Object
-get_char_table (Emchar ch, Lisp_Object table)
+get_char_table (Ichar ch, Lisp_Object table)
 )
 {
   Lisp_Object retval;
@@ -150,7 +150,7 @@
     retval = ct->ascii[ch];
   else
     {
-      unsigned char lb = emchar_leading_byte (ch);
+      unsigned char lb = ichar_leading_byte (ch);
       if (!CHAR_TABLE_ENTRYP (ct->level1[lb - MIN_LEADING_BYTE]))
 	retval = ct->level1[lb - MIN_LEADING_BYTE];
       else
@@ -178,7 +178,7 @@
 struct chartab_range
 {
   enum chartab_range_type type;
-  Emchar ch;
+  Ichar ch;
   Lisp_Object charset;
   int row;
 };
@@ -197,7 +197,7 @@
 				  Lisp_Object table, Lisp_Object multi);
 void copy_char_table_range (Lisp_Object from, Lisp_Object to,
 			    struct chartab_range *range);
-int word_boundary_p (Emchar c1, Emchar c2);
+int word_boundary_p (Ichar c1, Ichar c2);

 EXFUN (Fcopy_char_table, 1);
 EXFUN (Fmake_char_table, 1);
@@ -209,7 +209,7 @@


 #ifdef MULE
-int check_category_char (Emchar ch, Lisp_Object ctbl, int designator,
+int check_category_char (Ichar ch, Lisp_Object ctbl, int designator,
 			 int not_p);

 extern Lisp_Object Vstandard_category_table;
--- a/src/cmds.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/cmds.c	Wed Jun 05 09:58:45 2002 +0000
@@ -318,7 +318,7 @@
   return Fdelete_char (make_int (- n), killp);
 }

-static void internal_self_insert (Emchar ch, int noautofill);
+static void internal_self_insert (Ichar ch, int noautofill);

 DEFUN ("self-insert-command", Fself_insert_command, 1, 1, "*p", /*
 Insert the character you type.
@@ -328,7 +328,7 @@
        (count))
 {
   /* This function can GC */
-  Emchar ch;
+  Ichar ch;
   Lisp_Object c;
   EMACS_INT n;

@@ -364,12 +364,12 @@
    A value of 2 means this did things that call for an undo boundary.  */

 static void
-internal_self_insert (Emchar c1, int noautofill)
+internal_self_insert (Ichar c1, int noautofill)
 {
   /* This function can GC */
   /* int hairy = 0; -- unused */
   REGISTER enum syntaxcode synt;
-  REGISTER Emchar c2;
+  REGISTER Ichar c2;
   Lisp_Object overwrite;
   Lisp_Object syntax_table;
   struct buffer *buf = current_buffer;
--- a/src/console-gtk.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console-gtk.h	Wed Jun 05 09:58:45 2002 +0000
@@ -218,7 +218,7 @@
 void gtk_redraw_exposed_area (struct frame *f, int x, int y,
 			    int width, int height);
 void gtk_output_string (struct window *w, struct display_line *dl,
-		      Emchar_dynarr *buf, int xpos, int xoffset,
+		      Ichar_dynarr *buf, int xpos, int xoffset,
 		      int start_pixpos, int width, face_index findex,
 		      int cursor, int cursor_start, int cursor_width,
 		      int cursor_height);
--- a/src/console-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -92,7 +92,7 @@
 GetConsoleHwnd (void)
 {
   HWND hwndFound;
-  Intbyte newtitleint[200];
+  Ibyte newtitleint[200];
   Extbyte *newtitle;
   Extbyte *oldtitle;
   int numchars;
@@ -234,7 +234,7 @@
 int mswindows_message_outputted;

 int
-mswindows_output_console_string (const Intbyte *ptr, Bytecount len)
+mswindows_output_console_string (const Ibyte *ptr, Bytecount len)
 {
   DWORD num_written;

@@ -270,11 +270,11 @@
       (XSTRING_DATA (char_or_string), XSTRING_LENGTH (char_or_string));
   else
     {
-      Intbyte str[MAX_EMCHAR_LEN];
+      Ibyte str[MAX_ICHAR_LEN];
       Bytecount len;

       CHECK_CHAR_COERCE_INT (char_or_string);
-      len = set_charptr_emchar (str, XCHAR (char_or_string));
+      len = set_itext_ichar (str, XCHAR (char_or_string));
       write_string_to_mswindows_debugging_output (str, len);
     }

@@ -282,7 +282,7 @@
 }

 void
-write_string_to_mswindows_debugging_output (Intbyte *str, Bytecount len)
+write_string_to_mswindows_debugging_output (Ibyte *str, Bytecount len)
 {
   const Extbyte *extptr;
   if (initialized && !inhibit_non_essential_printing_operations)
@@ -338,8 +338,8 @@
   return (CONSP (obj) && CONSP (XCDR (obj))) ? XCONS (XCDR (obj)) : 0;
 }

-Intbyte *DSTRING (Lisp_Object obj);
-Intbyte *
+Ibyte *DSTRING (Lisp_Object obj);
+Ibyte *
 DSTRING (Lisp_Object obj)
 {
   return STRINGP (obj) ? XSTRING_DATA (obj) : NULL;
@@ -359,8 +359,8 @@
   return SYMBOLP (obj) ? XSYMBOL (obj) : NULL;
 }

-Intbyte *DSYMNAME (Lisp_Object obj);
-Intbyte *
+Ibyte *DSYMNAME (Lisp_Object obj);
+Ibyte *
 DSYMNAME (Lisp_Object obj)
 {
   return SYMBOLP (obj) ? XSTRING_DATA (XSYMBOL (obj)->name) : NULL;
--- a/src/console-msw.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console-msw.h	Wed Jun 05 09:58:45 2002 +0000
@@ -347,7 +347,7 @@
 					  Lisp_Object barg, int flags);
 void mswindows_unmodalize_signal_maybe (void);

-COLORREF mswindows_string_to_color (const Intbyte *name);
+COLORREF mswindows_string_to_color (const Ibyte *name);

 #ifdef HAVE_WIN32_PROCESSES
 HANDLE get_nt_process_handle_only_first_time (Lisp_Process *p);
@@ -364,9 +364,9 @@
 Lisp_Object mswindows_enumerate_fonts (HDC hdc);

 #ifdef HAVE_MENUBARS
-int mswindows_char_is_accelerator (struct frame *f, Emchar ch);
+int mswindows_char_is_accelerator (struct frame *f, Ichar ch);
 Lisp_Object mswindows_translate_menu_or_dialog_item (Lisp_Object item,
-						     Emchar *accel);
+						     Ichar *accel);
 #endif

 #ifdef HAVE_TOOLBARS
--- a/src/console-stream.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console-stream.c	Wed Jun 05 09:58:45 2002 +0000
@@ -178,7 +178,7 @@

 static int
 stream_text_width (struct frame *f, struct face_cachel *cachel,
-		   const Emchar *str, Charcount len)
+		   const Ichar *str, Charcount len)
 {
   return len;
 }
--- a/src/console-tty.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console-tty.c	Wed Jun 05 09:58:45 2002 +0000
@@ -77,7 +77,7 @@
     CHECK_STRING (terminal_type);
   else
     {
-      Intbyte *temp_type = egetenv ("TERM");
+      Ibyte *temp_type = egetenv ("TERM");

       if (!temp_type)
 	{
@@ -143,7 +143,7 @@
        would have two controlling TTY's, which is not allowed). */

     EMACS_GET_TTY_PROCESS_GROUP (tty_con->infd, &tty_pg);
-    cfd = qxe_open ((Intbyte *) "/dev/tty", O_RDWR, 0);
+    cfd = qxe_open ((Ibyte *) "/dev/tty", O_RDWR, 0);
     EMACS_GET_TTY_PROCESS_GROUP (cfd, &controlling_tty_pg);
     retry_close (cfd);
     if (tty_pg == controlling_tty_pg)
--- a/src/console-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -48,21 +48,21 @@
 split_up_display_spec (Lisp_Object display, int *hostname_length,
 		       int *display_length, int *screen_length)
 {
-  Intbyte *beg = XSTRING_DATA (display);
-  Intbyte *end = beg + XSTRING_LENGTH (display);
-  Intbyte *p = end;
+  Ibyte *beg = XSTRING_DATA (display);
+  Ibyte *end = beg + XSTRING_LENGTH (display);
+  Ibyte *p = end;

   while (p > beg)
     {
-      DEC_CHARPTR (p);
-      if (charptr_emchar (p) == ':')
+      DEC_IBYTEPTR (p);
+      if (itext_ichar (p) == ':')
 	{
 	  *hostname_length = p - beg;

 	  while (p < end - 1)
 	    {
-	      INC_CHARPTR (p);
-	      if (charptr_emchar (p) == '.')
+	      INC_IBYTEPTR (p);
+	      if (itext_ichar (p) == '.')
 		{
 		  *display_length = p - beg - *hostname_length;
 		  *screen_length = end - p;
@@ -193,20 +193,20 @@
   connection = x_device_to_console_connection (connection, errb);

   /* Check for a couple of standard special cases */
-  if (string_emchar (connection, 0) == ':')
+  if (string_ichar (connection, 0) == ':')
     connection = concat2 (build_string ("localhost"), connection);
   else
     {
       /* connection =~ s/^unix:/localhost:/; */
-      const Intbyte *p   = XSTRING_DATA (connection);
-      const Intbyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection);
+      const Ibyte *p   = XSTRING_DATA (connection);
+      const Ibyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection);
       int i;

       for (i = 0; i < (int) sizeof ("unix:") - 1; i++)
 	{
-	  if (p == end || charptr_emchar (p) != "unix:"[i])
+	  if (p == end || itext_ichar (p) != "unix:"[i])
 	    goto ok;
-	  INC_CHARPTR (p);
+	  INC_IBYTEPTR (p);
 	}

       connection = concat2 (build_string ("localhost:"),
--- a/src/console-x.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console-x.h	Wed Jun 05 09:58:45 2002 +0000
@@ -406,7 +406,7 @@
 void x_redraw_exposed_area (struct frame *f, int x, int y,
 			    int width, int height);
 void x_output_string (struct window *w, struct display_line *dl,
-		      Emchar_dynarr *buf, int xpos, int xoffset,
+		      Ichar_dynarr *buf, int xpos, int xoffset,
 		      int start_pixpos, int width, face_index findex,
 		      int cursor, int cursor_start, int cursor_width,
 		      int cursor_height);
--- a/src/console.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/console.h	Wed Jun 05 09:58:45 2002 +0000
@@ -162,8 +162,8 @@
   int (*frame_visible_p_method) (struct frame *f);
   int (*frame_totally_visible_p_method) (struct frame *f);
   int (*frame_iconified_p_method) (struct frame *f);
-  void (*set_title_from_intbyte_method) (struct frame *f, Intbyte *title);
-  void (*set_icon_name_from_intbyte_method) (struct frame *f, Intbyte *title);
+  void (*set_title_from_ibyte_method) (struct frame *f, Ibyte *title);
+  void (*set_icon_name_from_ibyte_method) (struct frame *f, Ibyte *title);
   void (*set_frame_pointer_method) (struct frame *f);
   void (*set_frame_icon_method) (struct frame *f);
   void (*popup_menu_method) (Lisp_Object menu, Lisp_Object event);
@@ -176,7 +176,7 @@
   int (*left_margin_width_method) (struct window *);
   int (*right_margin_width_method) (struct window *);
   int (*text_width_method) (struct frame *f, struct face_cachel *cachel,
-			    const Emchar *str, Charcount len);
+			    const Ichar *str, Charcount len);
   void (*output_display_block_method) (struct window *, struct display_line *,
 				       int, int, int, int, int, int, int);
   int (*divider_height_method) (void);
@@ -203,7 +203,7 @@
 				face_index findex, int cursor_start, int cursor_width,
 				int cursor_height, int offset_bitmap);
   void (*output_string_method) (struct window *w, struct display_line *dl,
-				Emchar_dynarr *buf, int xpos, int xoffset,
+				Ichar_dynarr *buf, int xpos, int xoffset,
 				int start_pixpos, int width, face_index findex,
 				int cursor, int cursor_start, int cursor_width,
 				int cursor_height);
@@ -246,7 +246,7 @@
 					   Lisp_Object charset);
   int (*font_spec_matches_charset_method) (struct device *d,
 					   Lisp_Object charset,
-					   const Intbyte *nonreloc,
+					   const Ibyte *nonreloc,
 					   Lisp_Object reloc,
 					   Bytecount offset,
 					   Bytecount length);
@@ -445,7 +445,7 @@
   /* Character that causes a quit.  Normally C-g.
      #### Should be possible for this not to be ASCII. (Currently works
      under Windows.) */
-  Emchar quit_char;
+  Ichar quit_char;

   /* ----- begin partially-completed console localization of
            event loop ---- */
--- a/src/data.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/data.c	Wed Jun 05 09:58:45 2002 +0000
@@ -364,7 +364,7 @@
 */
        (subr))
 {
-  const CIntbyte *prompt;
+  const CIbyte *prompt;
   CHECK_SUBR (subr);
   prompt = XSUBR (subr)->prompt;
   return prompt ? list2 (Qinteractive, build_msg_string (prompt)) : Qnil;
@@ -723,7 +723,7 @@
   else if (STRINGP (array))
     {
       if (idx >= string_char_length (array)) goto range_error;
-      return make_char (string_emchar (array, idx));
+      return make_char (string_ichar (array, idx));
     }
 #ifdef LOSING_BYTECODE
   else if (COMPILED_FUNCTIONP (array))
--- a/src/device-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/device-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -427,7 +427,7 @@
 msprinter_default_printer (void)
 {
   Extbyte name[666];
-  Intbyte *nameint;
+  Ibyte *nameint;

   if (qxeGetProfileString (XETEXT ("windows"), XETEXT ("device"), NULL, name,
 			   sizeof (name) / XETCHAR_SIZE) <= 0)
@@ -596,7 +596,7 @@
 	     Nothing wrong on the Windows side, just forge a unique
 	     connection name. Use the memory address of d as a unique
 	     suffix. */
-	  Intbyte new_connext[20];
+	  Ibyte new_connext[20];

 	  qxesprintf (new_connext, ":%X", d->header.uid);
 	  new_connection = concat2 (devname, build_intstring (new_connext));
--- a/src/device-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/device-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -220,7 +220,7 @@
   strcat (buf2, "._no_._such_._resource_.Geometry");
   if (XrmGetResource (XtDatabase (dpy), buf1, buf2, &type, &value) == True)
     {
-      Intbyte *app_name_int, *app_class_int, *value_addr_int;
+      Ibyte *app_name_int, *app_class_int, *value_addr_int;
       Lisp_Object codesys = coding_system_of_xrm_database (XtDatabase (dpy));
       EXTERNAL_TO_C_STRING (app_name, app_name_int, codesys);
       EXTERNAL_TO_C_STRING (app_class, app_class_int, codesys);
@@ -1122,7 +1122,7 @@
 signal_if_x_error (Display *dpy, int resumable_p)
 {
   Extbyte buf[1024];
-  Intbyte num[100];
+  Ibyte num[100];
   Lisp_Object data;
   if (! x_error_occurred_p (dpy))
     return 0;
@@ -1164,7 +1164,7 @@
     {
       int depth = begin_dont_check_for_quit ();
       /* We're going down. */
-      Intbyte *errmess;
+      Ibyte *errmess;
       GET_STRERROR (errmess, errno);
       stderr_out ("\n%s: Fatal I/O Error %d (%s) on display "
 		  "connection \"%s\"\n",
@@ -1180,7 +1180,7 @@
     }
   else
     {
-      Intbyte *errmess;
+      Ibyte *errmess;
       GET_STRERROR (errmess, errno);
       warn_when_safe
 	(Qx, Qcritical,
@@ -1596,9 +1596,9 @@
   if (!display)
     return Qnil;

-  return Fcons (make_string ((Intbyte *) Dynarr_atp (name_Extbyte_dynarr, 0),
+  return Fcons (make_string ((Ibyte *) Dynarr_atp (name_Extbyte_dynarr, 0),
 			     Dynarr_length (name_Extbyte_dynarr)),
-		make_string ((Intbyte *) Dynarr_atp (class_Extbyte_dynarr, 0),
+		make_string ((Ibyte *) Dynarr_atp (class_Extbyte_dynarr, 0),
 			     Dynarr_length (class_Extbyte_dynarr)));
 }
--- a/src/dialog-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/dialog-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -256,7 +256,7 @@
   /* !!#### do Japanese chars count as two? */
   int width =
     X_DLU_PER_CHAR *
-      intbyte_string_displayed_columns (XSTRING_DATA (text),
+      ibyte_string_displayed_columns (XSTRING_DATA (text),
 					XSTRING_LENGTH (text));
   return max (X_MIN_BUTTON, width);
 }
@@ -588,14 +588,14 @@

   /* Determine the final width layout */
   {
-    Intbyte *p = XSTRING_DATA (question);
+    Ibyte *p = XSTRING_DATA (question);
     Charcount string_max = 0, this_length = 0;
     while (1)
       {
-	Emchar ch = charptr_emchar (p);
-	INC_CHARPTR (p);
+	Ichar ch = itext_ichar (p);
+	INC_IBYTEPTR (p);

-	if (ch == (Emchar)'\n' || ch == (Emchar)'\0')
+	if (ch == (Ichar)'\n' || ch == (Ichar)'\0')
 	  {
 	    string_max = max (this_length, string_max);
 	    this_length = 0;
@@ -603,7 +603,7 @@
 	else
 	  ++this_length;

-	if (ch == (Emchar)'\0')
+	if (ch == (Ichar)'\0')
 	  break;
       }

@@ -618,17 +618,17 @@

   /* Now calculate the height for the text control */
   {
-    Intbyte *p = XSTRING_DATA (question);
+    Ibyte *p = XSTRING_DATA (question);
     Charcount break_at = text_width / X_DLU_PER_CHAR;
     Charcount char_pos = 0;
     int num_lines = 1;
-    Emchar ch;
+    Ichar ch;

-    while ((ch = charptr_emchar (p)) != (Emchar) '\0')
+    while ((ch = itext_ichar (p)) != (Ichar) '\0')
       {
-	INC_CHARPTR (p);
-	char_pos += ch != (Emchar) '\n';
-	if (ch == (Emchar) '\n' || char_pos == break_at)
+	INC_IBYTEPTR (p);
+	char_pos += ch != (Ichar) '\n';
+	if (ch == (Ichar) '\n' || char_pos == break_at)
 	  {
 	    ++num_lines;
 	    char_pos = 0;
@@ -721,7 +721,7 @@

 	/* Next thing to add is control text, as Unicode string */
 	{
-	  Emchar accel_unused;
+	  Ichar accel_unused;

 	  push_lisp_string_as_unicode
 	    (template_,
--- a/src/dired-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/dired-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -118,7 +118,7 @@
   FILETIME ftLastWriteTime;
   DWORD nFileSizeHigh;
   DWORD nFileSizeLow;
-  Intbyte *cFileName;
+  Ibyte *cFileName;
 } Win32_file;

 typedef struct
@@ -284,7 +284,7 @@
 		       hide_dot)))
 		{
 		  file.cFileName =
-		    (Intbyte *) xmalloc (sizeof (Intbyte) * (1 + len));
+		    (Ibyte *) xmalloc (sizeof (Ibyte) * (1 + len));
 		  memcpy (file.cFileName, eidata (filename), len);
 		  file.cFileName[len] = '\0';
 		  Dynarr_add (files, file);
@@ -306,7 +306,7 @@
   Lisp_Object luser;
   double file_size;
   DECLARE_EISTRING (puta);
-  CIntbyte buf[666];
+  CIbyte buf[666];

   file_size =
     file->nFileSizeHigh * (double)UINT_MAX + file->nFileSizeLow;
@@ -334,11 +334,11 @@
       is_executable = 1;
     else if (qxestrcharlen (file->cFileName) > 4)
       {
-	Intbyte *end = file->cFileName + qxestrlen (file->cFileName);
-	DEC_CHARPTR (end);
-	DEC_CHARPTR (end);
-	DEC_CHARPTR (end);
-	DEC_CHARPTR (end);
+	Ibyte *end = file->cFileName + qxestrlen (file->cFileName);
+	DEC_IBYTEPTR (end);
+	DEC_IBYTEPTR (end);
+	DEC_IBYTEPTR (end);
+	DEC_IBYTEPTR (end);
 	if (qxestrcasecmp (end, ".exe") == 0
 	    || qxestrcasecmp (end, ".com") == 0
 	    || qxestrcasecmp (end, ".bat") == 0
@@ -364,14 +364,14 @@
     sprintf (buf, "%-9d", 0);
   else
     {
-      Intbyte *str;
+      Ibyte *str;

       str = XSTRING_DATA (luser);
       sprintf (buf, "%-8s ", str);
     }
-  eicat_raw (puta, (Intbyte *) buf, strlen (buf));
+  eicat_raw (puta, (Ibyte *) buf, strlen (buf));
   {
-    CIntbyte *cptr = buf;
+    CIbyte *cptr = buf;
     sprintf (buf, "%-8d ", getgid ());
     cptr += 9;
     if (file_size > 99999999.0)
@@ -388,7 +388,7 @@
       ++cptr;
     {
       time_t t, now;
-      Intbyte *ctimebuf;
+      Ibyte *ctimebuf;

       if (
 #if 0
@@ -470,14 +470,14 @@

   if (!NILP (switches))
     {
-      Intbyte *cptr, *cptr_end;
+      Ibyte *cptr, *cptr_end;

       CHECK_STRING (switches);
       cptr = XSTRING_DATA (switches);
       cptr_end = cptr + XSTRING_LENGTH (switches);
       while (cptr < cptr_end)
 	{
-	  Emchar ch = charptr_emchar (cptr);
+	  Ichar ch = itext_ichar (cptr);
 	  switch (ch)
 	    {
 	    case 'A':
@@ -500,7 +500,7 @@
 	      sort_by = MSWINDOWS_SORT_BY_MOD_DATE;
 	      break;
 	    }
-	  INC_CHARPTR (cptr);
+	  INC_IBYTEPTR (cptr);
 	}
     }
--- a/src/dired.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/dired.c	Wed Jun 05 09:58:45 2002 +0000
@@ -78,7 +78,7 @@
   Lisp_Object handler;
   struct re_pattern_buffer *bufp = NULL;
   int speccount = specpdl_depth ();
-  Intbyte *statbuf, *statbuf_tail;
+  Ibyte *statbuf, *statbuf_tail;

   struct gcpro gcpro1, gcpro2;
   GCPRO2 (directory, list);
@@ -103,7 +103,7 @@
   directory = Ffile_name_as_directory (directory);
   directorylen = XSTRING_LENGTH (directory);

-  statbuf = (Intbyte *) ALLOCA (directorylen + MAXNAMLEN + 1);
+  statbuf = (Ibyte *) ALLOCA (directorylen + MAXNAMLEN + 1);
   memcpy (statbuf, XSTRING_DATA (directory), directorylen);
   statbuf_tail = statbuf + directorylen;

@@ -168,7 +168,7 @@

 	  {
 	    Lisp_Object name =
-	      make_string ((Intbyte *)dp->d_name, len);
+	      make_string ((Ibyte *)dp->d_name, len);
 	    if (!NILP (full))
 	      name = concat2 (directory, name);

@@ -250,7 +250,7 @@
   Bytecount len = NAMLEN (dp);
   Bytecount pos = XSTRING_LENGTH (directory);
   int value;
-  Intbyte *fullname = (Intbyte *) ALLOCA (len + pos + 2);
+  Ibyte *fullname = (Ibyte *) ALLOCA (len + pos + 2);

   memcpy (fullname, XSTRING_DATA (directory), pos);
   if (!IS_DIRECTORY_SEP (fullname[pos - 1]))
@@ -353,13 +353,13 @@
 	  Charcount cclen;
           int directoryp;
           int ignored_extension_p = 0;
-	  Intbyte *d_name;
+	  Ibyte *d_name;

 	  dp = qxe_readdir (d);
 	  if (!dp) break;

-	  /* Cast to Intbyte* is OK, as qxe_readdir() Mule-encapsulates.  */
-	  d_name = (Intbyte *) dp->d_name;
+	  /* Cast to Ibyte* is OK, as qxe_readdir() Mule-encapsulates.  */
+	  d_name = (Ibyte *) dp->d_name;
 	  len = NAMLEN (dp);
 	  cclen = bytecount_to_charcount (d_name, len);

@@ -402,7 +402,7 @@
 		      skip = cclen - string_char_length (elt);
 		      if (skip < 0) continue;

-		      if (0 > scmp (charptr_n_addr (d_name, skip),
+		      if (0 > scmp (itext_n_addr (d_name, skip),
 				    XSTRING_DATA (elt),
 				    string_char_length (elt)))
 			{
@@ -447,8 +447,8 @@
           else
             {
               Charcount compare = min (bestmatchsize, cclen);
-              Intbyte *p1 = XSTRING_DATA (bestmatch);
-              Intbyte *p2 = d_name;
+              Ibyte *p1 = XSTRING_DATA (bestmatch);
+              Ibyte *p2 = d_name;
               Charcount matchsize = scmp (p1, p2, compare);

               if (matchsize < 0)
@@ -489,7 +489,7 @@
               if (directoryp
                   && compare == matchsize
                   && bestmatchsize > matchsize
-                  && IS_ANY_SEP (charptr_emchar_n (p1, matchsize)))
+                  && IS_ANY_SEP (itext_ichar_n (p1, matchsize)))
                 matchsize++;
               bestmatchsize = matchsize;
             }
@@ -559,7 +559,7 @@

 struct user_name
 {
-  Intbyte *ptr;
+  Ibyte *ptr;
   Bytecount len;
 };

@@ -649,7 +649,7 @@
 	  DO_REALLOC (user_cache.user_names, user_cache.size,
 		      user_cache.length + 1, struct user_name);
 	  user_cache.user_names[user_cache.length].ptr =
-	    (Intbyte *) xstrdup (pwd->pw_name);
+	    (Ibyte *) xstrdup (pwd->pw_name);
 	  user_cache.user_names[user_cache.length].len = strlen (pwd->pw_name);
 	  user_cache.length++;
         }
@@ -717,7 +717,7 @@

   for (i = 0; i < user_cache.length; i++)
     {
-      Intbyte *u_name = user_cache.user_names[i].ptr;
+      Ibyte *u_name = user_cache.user_names[i].ptr;
       Bytecount len   = user_cache.user_names[i].len;
       /* scmp() works in chars, not bytes, so we have to compute this: */
       Charcount cclen = bytecount_to_charcount (u_name, len);
@@ -751,8 +751,8 @@
       else
         {
           Charcount compare = min (bestmatchsize, cclen);
-          Intbyte *p1 = XSTRING_DATA (bestmatch);
-          Intbyte *p2 = u_name;
+          Ibyte *p1 = XSTRING_DATA (bestmatch);
+          Ibyte *p2 = u_name;
           Charcount matchsize = scmp_1 (p1, p2, compare, 0);

           if (matchsize < 0)
@@ -776,7 +776,7 @@


 Lisp_Object
-make_directory_hash_table (const Intbyte *path)
+make_directory_hash_table (const Ibyte *path)
 {
   DIR *d;
   if ((d = qxe_opendir (path)))
@@ -789,8 +789,8 @@
 	{
 	  Bytecount len = NAMLEN (dp);
 	  if (DIRENTRY_NONEMPTY (dp))
-	    /* Cast to Intbyte* is OK, as qxe_readdir() Mule-encapsulates.  */
-	    Fputhash (make_string ((Intbyte *) dp->d_name, len), Qt, hash);
+	    /* Cast to Ibyte* is OK, as qxe_readdir() Mule-encapsulates.  */
+	    Fputhash (make_string ((Ibyte *) dp->d_name, len), Qt, hash);
 	}
       qxe_closedir (d);
       return hash;
@@ -867,7 +867,7 @@

 #if 0 /* #### shouldn't this apply to WIN32_NATIVE and maybe CYGWIN? */
   {
-    Intbyte *tmpnam = XSTRING_DATA (Ffile_name_nondirectory (filename));
+    Ibyte *tmpnam = XSTRING_DATA (Ffile_name_nondirectory (filename));
     Bytecount l = qxestrlen (tmpnam);

     if (l >= 5
@@ -907,7 +907,7 @@
   if (XINT (values[7]) != s.st_size)
     values[7] = make_int (-1);
   filemodestring (&s, modes);
-  values[8] = make_string ((Intbyte *) modes, 10);
+  values[8] = make_string ((Ibyte *) modes, 10);
 #if defined (BSD4_2) || defined (BSD4_3)	/* file gid will be dir gid */
   {
     struct stat sdir;
--- a/src/doc.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/doc.c	Wed Jun 05 09:58:45 2002 +0000
@@ -46,14 +46,14 @@

 Lisp_Object
 unparesseuxify_doc_string (int fd, EMACS_INT position,
-                           Intbyte *name_nonreloc, Lisp_Object name_reloc,
+                           Ibyte *name_nonreloc, Lisp_Object name_reloc,
 			   int standard_doc_file)
 {
-  Intbyte buf[512 * 32 + 1];
-  Intbyte *buffer = buf;
+  Ibyte buf[512 * 32 + 1];
+  Ibyte *buffer = buf;
   int buffer_size = sizeof (buf);
-  Intbyte *from, *to;
-  REGISTER Intbyte *p = buffer;
+  Ibyte *from, *to;
+  REGISTER Ibyte *p = buffer;
   Lisp_Object return_me;
   Lisp_Object fdstream = Qnil, instream = Qnil;
   struct gcpro gcpro1, gcpro2;
@@ -97,14 +97,14 @@
       /* Switch to a bigger buffer if we need one.  */
       if (space_left == 0)
 	{
-          Intbyte *old_buffer = buffer;
+          Ibyte *old_buffer = buffer;
 	  if (buffer == buf)
 	    {
-	      buffer = (Intbyte *) xmalloc (buffer_size *= 2);
+	      buffer = (Ibyte *) xmalloc (buffer_size *= 2);
 	      memcpy (buffer, old_buffer, p - old_buffer);
 	    }
 	  else
-            buffer = (Intbyte *) xrealloc (buffer, buffer_size *= 2);
+            buffer = (Ibyte *) xrealloc (buffer, buffer_size *= 2);
           p += buffer - old_buffer;
 	  space_left = buffer_size - (p - buffer);
 	}
@@ -123,7 +123,7 @@
       if (!nread)
 	break;
       {
-	Intbyte *p1 = qxestrchr (p, '\037'); /* End of doc string marker */
+	Ibyte *p1 = qxestrchr (p, '\037'); /* End of doc string marker */
 	if (p1)
 	  {
 	    *p1 = 0;
@@ -194,7 +194,7 @@
 get_doc_string (Lisp_Object filepos)
 {
   REGISTER int fd;
-  REGISTER Intbyte *name_nonreloc = 0;
+  REGISTER Ibyte *name_nonreloc = 0;
   EMACS_INT position;
   Lisp_Object file, tem;
   Lisp_Object name_reloc = Qnil;
@@ -235,7 +235,7 @@
       /* sizeof ("../lib-src/") == 12 */
       if (minsize < 12)
 	minsize = 12;
-      name_nonreloc = alloca_intbytes (minsize + XSTRING_LENGTH (file) + 8);
+      name_nonreloc = alloca_ibytes (minsize + XSTRING_LENGTH (file) + 8);
       string_join (name_nonreloc, Vdoc_directory, file);
     }
   else
@@ -249,10 +249,10 @@
       if (purify_flag)
 	{
 	    /* sizeof ("../lib-src/") == 12 */
-	  name_nonreloc = (Intbyte *) ALLOCA (12 + XSTRING_LENGTH (file) + 8);
+	  name_nonreloc = (Ibyte *) ALLOCA (12 + XSTRING_LENGTH (file) + 8);
 	  /* Preparing to dump; DOC file is probably not installed.
 	     So check in ../lib-src. */
-	  qxestrcpy (name_nonreloc, (Intbyte *) "../lib-src/");
+	  qxestrcpy (name_nonreloc, (Ibyte *) "../lib-src/");
 	  qxestrcat (name_nonreloc, XSTRING_DATA (file));

 	  fd = qxe_open (name_nonreloc, O_RDONLY | OPEN_BINARY, 0);
@@ -422,7 +422,7 @@
 }

 static void
-weird_doc (Lisp_Object sym, const CIntbyte *weirdness, const CIntbyte *type,
+weird_doc (Lisp_Object sym, const CIbyte *weirdness, const CIbyte *type,
 	   int pos)
 {
   if (!strcmp (weirdness, GETTEXT ("duplicate"))) return;
@@ -441,12 +441,12 @@
        (filename))
 {
   int fd;
-  Intbyte buf[1024 + 1];
+  Ibyte buf[1024 + 1];
   REGISTER int filled;
   REGISTER int pos;
-  REGISTER Intbyte *p, *end;
+  REGISTER Ibyte *p, *end;
   Lisp_Object sym, fun, tem;
-  Intbyte *name;
+  Ibyte *name;

   /* This function should not pass the data it's reading through a coding
      stream.  The reason is that the only purpose of this function is to
@@ -467,7 +467,7 @@
   if (!NILP (Vdoc_directory))
     {
       CHECK_STRING (Vdoc_directory);
-      name = alloca_intbytes (XSTRING_LENGTH (filename)
+      name = alloca_ibytes (XSTRING_LENGTH (filename)
 			      + XSTRING_LENGTH (Vdoc_directory)
 			      + 1);
       qxestrcpy (name, XSTRING_DATA (Vdoc_directory));
@@ -475,8 +475,8 @@
   else
 #endif /* CANNOT_DUMP */
     {
-      name = alloca_intbytes (XSTRING_LENGTH (filename) + 14);
-      qxestrcpy (name, (Intbyte *) "../lib-src/");
+      name = alloca_ibytes (XSTRING_LENGTH (filename) + 14);
+      qxestrcpy (name, (Ibyte *) "../lib-src/");
     }

   qxestrcat (name, XSTRING_DATA (filename));
@@ -801,18 +801,18 @@
        (string))
 {
   /* This function can GC */
-  Intbyte *buf;
+  Ibyte *buf;
   int changed = 0;
-  REGISTER Intbyte *strdata;
-  REGISTER Intbyte *bufp;
+  REGISTER Ibyte *strdata;
+  REGISTER Ibyte *bufp;
   Bytecount strlength;
   Bytecount idx;
   Bytecount bsize;
-  Intbyte *new;
+  Ibyte *new;
   Lisp_Object tem = Qnil;
   Lisp_Object keymap = Qnil;
   Lisp_Object name = Qnil;
-  Intbyte *start;
+  Ibyte *start;
   Bytecount length;
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;

@@ -847,14 +847,14 @@

   strlength = XSTRING_LENGTH (string);
   bsize = 1 + strlength;
-  buf = (Intbyte *) xmalloc (bsize);
+  buf = (Ibyte *) xmalloc (bsize);
   bufp = buf;

   /* Have to reset strdata every time GC might be called */
   strdata = XSTRING_DATA (string);
   for (idx = 0; idx < strlength; )
     {
-      Intbyte *strp = strdata + idx;
+      Ibyte *strp = strdata + idx;

       if (strp[0] != '\\')
 	{
@@ -919,7 +919,7 @@

 	    if (NILP (tem))	/* but not on any keys */
 	      {
-		new = (Intbyte *) xrealloc (buf, bsize += 4);
+		new = (Ibyte *) xrealloc (buf, bsize += 4);
 		bufp += new - buf;
 		buf = new;
 		memcpy (bufp, "M-x ", 4);
@@ -993,7 +993,7 @@
 	  length = XSTRING_LENGTH (tem);
 	subst:
 	  bsize += length;
-	  new = (Intbyte *) xrealloc (buf, bsize);
+	  new = (Ibyte *) xrealloc (buf, bsize);
 	  bufp += new - buf;
 	  buf = new;
 	  memcpy (bufp, start, length);
--- a/src/doprnt.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/doprnt.c	Wed Jun 05 09:58:45 2002 +0000
@@ -69,7 +69,7 @@
   long l;
   unsigned long ul;
   double d;
-  Intbyte *bp;
+  Ibyte *bp;
 };

 /* We maintain a list of all the % specs in the specification,
@@ -99,7 +99,7 @@
    Note that MINLEN and MAXLEN are Charcounts but LEN is a Bytecount. */

 static void
-doprnt_2 (Lisp_Object stream, const Intbyte *string, Bytecount len,
+doprnt_2 (Lisp_Object stream, const Ibyte *string, Bytecount len,
 	  Charcount minlen, Charcount maxlen, int minus_flag, int zero_flag)
 {
   Lstream *lstr = XLSTREAM (stream);
@@ -121,11 +121,11 @@
       Lstream_putc (lstr, zero_flag ? '0' : ' ');
 }

-static const Intbyte *
-parse_off_posnum (const Intbyte *start, const Intbyte *end, int *returned_num)
+static const Ibyte *
+parse_off_posnum (const Ibyte *start, const Ibyte *end, int *returned_num)
 {
-  Intbyte arg_convert[100];
-  REGISTER Intbyte *arg_ptr = arg_convert;
+  Ibyte arg_convert[100];
+  REGISTER Ibyte *arg_ptr = arg_convert;

   *returned_num = -1;
   while (start != end && isdigit (*start))
@@ -160,23 +160,23 @@
   } while (0)

 static printf_spec_dynarr *
-parse_doprnt_spec (const Intbyte *format, Bytecount format_length)
+parse_doprnt_spec (const Ibyte *format, Bytecount format_length)
 {
-  const Intbyte *fmt = format;
-  const Intbyte *fmt_end = format + format_length;
+  const Ibyte *fmt = format;
+  const Ibyte *fmt_end = format + format_length;
   printf_spec_dynarr *specs = Dynarr_new (printf_spec);
   int prev_argnum = 0;

   while (1)
     {
       struct printf_spec spec;
-      const Intbyte *text_end;
-      Intbyte ch;
+      const Ibyte *text_end;
+      Ibyte ch;

       xzero (spec);
       if (fmt == fmt_end)
 	return specs;
-      text_end = (Intbyte *) memchr (fmt, '%', fmt_end - fmt);
+      text_end = (Ibyte *) memchr (fmt, '%', fmt_end - fmt);
       if (!text_end)
 	text_end = fmt_end;
       spec.text_before = fmt - format;
@@ -198,7 +198,7 @@

 	  /* Is there a field number specifier? */
 	  {
-	    const Intbyte *ptr;
+	    const Ibyte *ptr;
 	    int fieldspec;

 	    ptr = parse_off_posnum (fmt, fmt_end, &fieldspec);
@@ -384,7 +384,7 @@
       else if (strchr (double_converters, ch))
 	arg.d = va_arg (vargs, double);
       else if (strchr (string_converters, ch))
-	arg.bp = va_arg (vargs, Intbyte *);
+	arg.bp = va_arg (vargs, Ibyte *);
       else abort ();

       Dynarr_add (args, arg);
@@ -405,7 +405,7 @@
    standard sprintf() behavior or `format' behavior.) */

 static Bytecount
-emacs_doprnt_1 (Lisp_Object stream, const Intbyte *format_nonreloc,
+emacs_doprnt_1 (Lisp_Object stream, const Ibyte *format_nonreloc,
 		Bytecount format_length, Lisp_Object format_reloc,
 		int nargs, const Lisp_Object *largs, va_list vargs)
 {
@@ -461,7 +461,7 @@

       if (ch == '%')
 	{
-	  doprnt_2 (stream, (Intbyte *) &ch, 1, 0, -1, 0, 0);
+	  doprnt_2 (stream, (Ibyte *) &ch, 1, 0, -1, 0, 0);
 	  continue;
 	}

@@ -504,7 +504,7 @@

       else if (ch == 'S' || ch == 's')
 	{
-	  Intbyte *string;
+	  Ibyte *string;
 	  Bytecount string_len;

 	  if (!largs)
@@ -520,7 +520,7 @@
 		 Do not hide bugs. --ben
 	      */
 	      if (!string)
-		string = (Intbyte *) "(null)";
+		string = (Ibyte *) "(null)";
 #else
 	      assert (string);
 #endif
@@ -591,17 +591,17 @@

 	  if (ch == 'c')
 	    {
-	      Emchar a;
+	      Ichar a;
 	      Bytecount charlen;
-	      Intbyte charbuf[MAX_EMCHAR_LEN];
+	      Ibyte charbuf[MAX_ICHAR_LEN];

-	      a = (Emchar) arg.l;
+	      a = (Ichar) arg.l;

-	      if (!valid_emchar_p (a))
+	      if (!valid_ichar_p (a))
 		syntax_error ("invalid character value %d to %%c spec",
 			      make_int (a));

-	      charlen = set_charptr_emchar (charbuf, a);
+	      charlen = set_itext_ichar (charbuf, a);
 	      doprnt_2 (stream, charbuf, charlen, spec->minwidth,
 			-1, spec->minus_flag, spec->zero_flag);
 	    }
@@ -658,7 +658,7 @@
 		    sprintf (text_to_print, constructed_spec, arg.l);
 		}

-	      doprnt_2 (stream, (Intbyte *) text_to_print,
+	      doprnt_2 (stream, (Ibyte *) text_to_print,
 			strlen (text_to_print), 0, -1, 0, 0);
 	    }
 	}
@@ -673,7 +673,7 @@
  */

 Bytecount
-emacs_doprnt_va (Lisp_Object stream, const Intbyte *format_nonreloc,
+emacs_doprnt_va (Lisp_Object stream, const Ibyte *format_nonreloc,
 		 Bytecount format_length, Lisp_Object format_reloc,
 		 va_list vargs)
 {
@@ -686,7 +686,7 @@
  */

 Bytecount
-emacs_doprnt (Lisp_Object stream, const Intbyte *format_nonreloc,
+emacs_doprnt (Lisp_Object stream, const Ibyte *format_nonreloc,
 	      Bytecount format_length, Lisp_Object format_reloc,
 	      int nargs, const Lisp_Object *largs, ...)
 {
@@ -714,7 +714,7 @@
    */

 Lisp_Object
-emacs_vsprintf_string_lisp (const CIntbyte *format_nonreloc,
+emacs_vsprintf_string_lisp (const CIbyte *format_nonreloc,
 			    Lisp_Object format_reloc, int nargs,
 			    const Lisp_Object *largs)
 {
@@ -725,7 +725,7 @@
   gcpro1.nvars = nargs;

   stream = make_resizing_buffer_output_stream ();
-  emacs_doprnt (stream, (Intbyte *) format_nonreloc, format_nonreloc ?
+  emacs_doprnt (stream, (Ibyte *) format_nonreloc, format_nonreloc ?
 		strlen (format_nonreloc) : 0,
 		format_reloc, nargs, largs);
   Lstream_flush (XLSTREAM (stream));
@@ -740,7 +740,7 @@
    (using variable arguments), rather than as an array. */

 Lisp_Object
-emacs_sprintf_string_lisp (const CIntbyte *format_nonreloc,
+emacs_sprintf_string_lisp (const CIbyte *format_nonreloc,
 			   Lisp_Object format_reloc, int nargs, ...)
 {
   Lisp_Object *args = alloca_array (Lisp_Object, nargs);
@@ -760,13 +760,13 @@
 /* Like emacs_vsprintf_string_lisp() but returns a malloc()ed memory block.
    Return length out through LEN_OUT, if not null. */

-Intbyte *
-emacs_vsprintf_malloc_lisp (const CIntbyte *format_nonreloc,
+Ibyte *
+emacs_vsprintf_malloc_lisp (const CIbyte *format_nonreloc,
 			    Lisp_Object format_reloc, int nargs,
 			    const Lisp_Object *largs, Bytecount *len_out)
 {
   Lisp_Object stream;
-  Intbyte *retval;
+  Ibyte *retval;
   Bytecount len;
   struct gcpro gcpro1, gcpro2;

@@ -774,12 +774,12 @@
   gcpro1.nvars = nargs;

   stream = make_resizing_buffer_output_stream ();
-  emacs_doprnt (stream, (Intbyte *) format_nonreloc, format_nonreloc ?
+  emacs_doprnt (stream, (Ibyte *) format_nonreloc, format_nonreloc ?
 		strlen (format_nonreloc) : 0,
 		format_reloc, nargs, largs);
   Lstream_flush (XLSTREAM (stream));
   len = Lstream_byte_count (XLSTREAM (stream));
-  retval = (Intbyte *) xmalloc (len + 1);
+  retval = (Ibyte *) xmalloc (len + 1);
   memcpy (retval, resizing_buffer_stream_ptr (XLSTREAM (stream)), len);
   retval[len] = '\0';
   Lstream_delete (XLSTREAM (stream));
@@ -793,14 +793,14 @@
 /* Like emacs_sprintf_string_lisp() but returns a malloc()ed memory block.
    Return length out through LEN_OUT, if not null. */

-Intbyte *
-emacs_sprintf_malloc_lisp (Bytecount *len_out, const CIntbyte *format_nonreloc,
+Ibyte *
+emacs_sprintf_malloc_lisp (Bytecount *len_out, const CIbyte *format_nonreloc,
 			   Lisp_Object format_reloc, int nargs, ...)
 {
   Lisp_Object *args = alloca_array (Lisp_Object, nargs);
   va_list va;
   int i;
-  Intbyte *retval;
+  Ibyte *retval;

   va_start (va, nargs);
   for (i = 0; i < nargs; i++)
@@ -815,13 +815,13 @@
    from Lisp strings is OK because we explicitly inhibit GC. */

 Lisp_Object
-emacs_vsprintf_string (const CIntbyte *format, va_list vargs)
+emacs_vsprintf_string (const CIbyte *format, va_list vargs)
 {
   Lisp_Object stream = make_resizing_buffer_output_stream ();
   Lisp_Object obj;
   int count = begin_gc_forbidden ();

-  emacs_doprnt_va (stream, (Intbyte *) format, strlen (format), Qnil,
+  emacs_doprnt_va (stream, (Ibyte *) format, strlen (format), Qnil,
 		   vargs);
   Lstream_flush (XLSTREAM (stream));
   obj = make_string (resizing_buffer_stream_ptr (XLSTREAM (stream)),
@@ -835,7 +835,7 @@
    from Lisp strings is OK because we explicitly inhibit GC. */

 Lisp_Object
-emacs_sprintf_string (const CIntbyte *format, ...)
+emacs_sprintf_string (const CIbyte *format, ...)
 {
   va_list vargs;
   Lisp_Object retval;
@@ -850,20 +850,20 @@
    from Lisp strings is OK because we explicitly inhibit GC.  Return
    length out through LEN_OUT, if not null. */

-Intbyte *
-emacs_vsprintf_malloc (const CIntbyte *format, va_list vargs,
+Ibyte *
+emacs_vsprintf_malloc (const CIbyte *format, va_list vargs,
 		       Bytecount *len_out)
 {
   int count = begin_gc_forbidden ();
   Lisp_Object stream = make_resizing_buffer_output_stream ();
-  Intbyte *retval;
+  Ibyte *retval;
   Bytecount len;

-  emacs_doprnt_va (stream, (Intbyte *) format, strlen (format), Qnil,
+  emacs_doprnt_va (stream, (Ibyte *) format, strlen (format), Qnil,
 		   vargs);
   Lstream_flush (XLSTREAM (stream));
   len = Lstream_byte_count (XLSTREAM (stream));
-  retval = (Intbyte *) xmalloc (len + 1);
+  retval = (Ibyte *) xmalloc (len + 1);
   memcpy (retval, resizing_buffer_stream_ptr (XLSTREAM (stream)), len);
   retval[len] = '\0';
   end_gc_forbidden (count);
@@ -878,11 +878,11 @@
    from Lisp strings is OK because we explicitly inhibit GC.  Return length
    out through LEN_OUT, if not null. */

-Intbyte *
-emacs_sprintf_malloc (Bytecount *len_out, const CIntbyte *format, ...)
+Ibyte *
+emacs_sprintf_malloc (Bytecount *len_out, const CIbyte *format, ...)
 {
   va_list vargs;
-  Intbyte *retval;
+  Ibyte *retval;

   va_start (vargs, format);
   retval = emacs_vsprintf_malloc (format, vargs, len_out);
@@ -895,14 +895,14 @@
    because we explicitly inhibit GC.  */

 Bytecount
-emacs_vsprintf (Intbyte *output, const CIntbyte *format, va_list vargs)
+emacs_vsprintf (Ibyte *output, const CIbyte *format, va_list vargs)
 {
   Bytecount retval;
   int count = begin_gc_forbidden ();
   Lisp_Object stream = make_resizing_buffer_output_stream ();
   Bytecount len;

-  retval = emacs_doprnt_va (stream, (Intbyte *) format, strlen (format), Qnil,
+  retval = emacs_doprnt_va (stream, (Ibyte *) format, strlen (format), Qnil,
 			    vargs);
   Lstream_flush (XLSTREAM (stream));
   len = Lstream_byte_count (XLSTREAM (stream));
@@ -919,7 +919,7 @@
    because we explicitly inhibit GC.  */

 Bytecount
-emacs_sprintf (Intbyte *output, const CIntbyte *format, ...)
+emacs_sprintf (Ibyte *output, const CIbyte *format, ...)
 {
   va_list vargs;
   Bytecount retval;
--- a/src/editfns.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/editfns.c	Wed Jun 05 09:58:45 2002 +0000
@@ -82,7 +82,7 @@
 init_editfns (void)
 {
 /* Only used in removed code below. */
-  Intbyte *p;
+  Ibyte *p;

   environbuf = 0;

@@ -108,7 +108,7 @@
        (character))
 {
   Bytecount len;
-  Intbyte str[MAX_EMCHAR_LEN];
+  Ibyte str[MAX_ICHAR_LEN];

   if (EVENTP (character))
     {
@@ -121,7 +121,7 @@

   CHECK_CHAR_COERCE_INT (character);

-  len = set_charptr_emchar (str, XCHAR (character));
+  len = set_itext_ichar (str, XCHAR (character));
   return make_string (str, len);
 }

@@ -134,7 +134,7 @@
   CHECK_STRING (string);

   if (XSTRING_LENGTH (string) != 0)
-    return make_char (string_emchar (string, 0));
+    return make_char (string_ichar (string, 0));
   else
     /* This used to return Qzero.  That is broken, broken, broken. */
     /* It might be kinder to signal an error directly. -slb */
@@ -592,22 +592,22 @@
 */
        ())
 {
-  Intbyte *tmpdir;
+  Ibyte *tmpdir;
 #if defined(WIN32_NATIVE)
   tmpdir = egetenv ("TEMP");
   if (!tmpdir)
     tmpdir = egetenv ("TMP");
   if (!tmpdir)
-    tmpdir = (Intbyte *) "c:\\";
+    tmpdir = (Ibyte *) "c:\\";
 #else /* WIN32_NATIVE */
  tmpdir = egetenv ("TMPDIR");
  if (!tmpdir)
     {
       struct stat st;
       int myuid = getuid ();
-      Intbyte *login_name = user_login_name (NULL);
+      Ibyte *login_name = user_login_name (NULL);
       DECLARE_EISTRING (eipath);
-      Intbyte *path;
+      Ibyte *path;

       eicpy_c (eipath, "/tmp/");
       eicat_rawz (eipath, login_name);
@@ -642,7 +642,7 @@
 	  if (qxe_stat (path, &st) == 0 && S_ISDIR (st.st_mode))
 	    tmpdir = path;
 	  else
-	    tmpdir = (Intbyte *) "/tmp";
+	    tmpdir = (Ibyte *) "/tmp";
 	}
     }
 #endif
@@ -660,7 +660,7 @@
 */
        (uid))
 {
-  Intbyte *returned_name;
+  Ibyte *returned_name;
   uid_t local_uid;

   if (!NILP (uid))
@@ -689,21 +689,21 @@
    WARNING: The string returned comes from the data of a Lisp string and
    therefore will become garbage after the next GC.
 */
-Intbyte *
+Ibyte *
 user_login_name (uid_t *uid)
 {
   /* uid == NULL to return name of this user */
   if (uid != NULL)
     {
       struct passwd *pw = qxe_getpwuid (*uid);
-      return pw ? (Intbyte *) pw->pw_name : NULL;
+      return pw ? (Ibyte *) pw->pw_name : NULL;
     }
   else
     {
       /* #### - when euid != uid, then LOGNAME and USER are leftovers from the
 	 old environment (I site observed behavior on sunos and linux), so the
 	 environment variables should be disregarded in that case.  --Stig */
-      Intbyte *user_name = egetenv ("LOGNAME");
+      Ibyte *user_name = egetenv ("LOGNAME");
       if (!user_name)
 	user_name = egetenv (
 #ifdef WIN32_NATIVE
@@ -723,7 +723,7 @@
 	     cannot be determined.
 	  */
 	  /* !!#### fix up in my mule ws */
-	  return (Intbyte *) (pw ? pw->pw_name : "unknown");
+	  return (Ibyte *) (pw ? pw->pw_name : "unknown");
 #else
 	  /* For all but Cygwin return NULL (nil) */
 	  return pw ? pw->pw_name : NULL;
@@ -774,7 +774,7 @@
   Lisp_Object user_name;
   struct passwd *pw = NULL;
   Lisp_Object tem;
-  const Intbyte *p, *q;
+  const Ibyte *p, *q;

   if (NILP (user) && STRINGP (Vuser_full_name))
     return Vuser_full_name;
@@ -792,10 +792,10 @@
   /* #### - Stig sez: this should return nil instead of "unknown" when pw==0 */
   /* Ben sez: bad idea because it's likely to break something */
 #ifndef AMPERSAND_FULL_NAME
-  p = (Intbyte *) (pw ? USER_FULL_NAME : "unknown"); /* don't gettext */
+  p = (Ibyte *) (pw ? USER_FULL_NAME : "unknown"); /* don't gettext */
   q = qxestrchr (p, ',');
 #else
-  p = (Intbyte *) (pw ? USER_FULL_NAME : "unknown"); /* don't gettext */
+  p = (Ibyte *) (pw ? USER_FULL_NAME : "unknown"); /* don't gettext */
   q = qxestrchr (p, ',');
 #endif
   tem = ((!NILP (user) && !pw)
@@ -823,7 +823,7 @@
   return tem;
 }

-static Intbyte *cached_home_directory;
+static Ibyte *cached_home_directory;

 void
 uncache_home_directory (void)
@@ -834,7 +834,7 @@
 }

 /* Returns the home directory */
-Intbyte *
+Ibyte *
 get_home_directory (void)
 {
   int output_home_warning = 0;
@@ -847,13 +847,13 @@
       else
 	{
 #if defined (WIN32_NATIVE)
-	  Intbyte *homedrive, *homepath;
+	  Ibyte *homedrive, *homepath;

 	  if ((homedrive = egetenv ("HOMEDRIVE")) != NULL &&
 	      (homepath = egetenv ("HOMEPATH")) != NULL)
 	    {
 	      cached_home_directory =
-		(Intbyte *) xmalloc (qxestrlen (homedrive) +
+		(Ibyte *) xmalloc (qxestrlen (homedrive) +
 				     qxestrlen (homepath) + 1);
 	      qxesprintf (cached_home_directory, "%s%s",
 			  homedrive,
@@ -861,7 +861,7 @@
 	    }
 	  else
 	    {
-	      cached_home_directory = qxestrdup ((Intbyte *) "C:\\");
+	      cached_home_directory = qxestrdup ((Ibyte *) "C:\\");
 	      output_home_warning = 1;
 	    }
 #else	/* !WIN32_NATIVE */
@@ -871,7 +871,7 @@
 	   * We probably should try to extract pw_dir from /etc/passwd,
 	   * before falling back to this.
 	   */
-	  cached_home_directory = qxestrdup ((Intbyte *) "/");
+	  cached_home_directory = qxestrdup ((Ibyte *) "/");
 	  output_home_warning = 1;
 #endif	/* !WIN32_NATIVE */
 	}
@@ -894,7 +894,7 @@
 */
        ())
 {
-  Intbyte *path = get_home_directory ();
+  Ibyte *path = get_home_directory ();

   return !path ? Qnil :
     Fexpand_file_name (Fsubstitute_in_file_name (build_intstring (path)),
@@ -1229,7 +1229,7 @@
        (specified_time))
 {
   time_t value;
-  Intbyte *the_ctime;
+  Ibyte *the_ctime;
   EMACS_INT len; /* this is what make_ext_string() accepts; ####
 		    should it be an Bytecount? */

@@ -1316,7 +1316,7 @@
 	tem = build_ext_string (s, Qnative);
       else
 	{
-	  Intbyte buf[6];
+	  Ibyte buf[6];

 	  /* No local time zone name is available; use "+-NNNN" instead.  */
 	  int am = (offset < 0 ? -offset : offset) / 60;
@@ -1558,12 +1558,12 @@
        (character, count, ignored, buffer))
 {
   /* This function can GC */
-  REGISTER Intbyte *string;
+  REGISTER Ibyte *string;
   REGISTER Bytecount slen;
   REGISTER Bytecount i, j;
   REGISTER Bytecount n;
   REGISTER Bytecount charlen;
-  Intbyte str[MAX_EMCHAR_LEN];
+  Ibyte str[MAX_ICHAR_LEN];
   struct buffer *b = decode_buffer (buffer, 1);
   int cou;

@@ -1576,12 +1576,12 @@
       cou = XINT (count);
     }

-  charlen = set_charptr_emchar (str, XCHAR (character));
+  charlen = set_itext_ichar (str, XCHAR (character));
   n = cou * charlen;
   if (n <= 0)
     return Qnil;
   slen = min (n, (Bytecount) 768);
-  string = alloca_array (Intbyte, slen);
+  string = alloca_array (Ibyte, slen);
   /* Write as many copies of the character into the temp string as will fit. */
   for (i = 0; i + charlen <= slen; i += charlen)
     for (j = 0; j < charlen; j++)
@@ -1703,8 +1703,8 @@

   for (i = 0; i < length; i++)
     {
-      Emchar c1 = BUF_FETCH_CHAR (bp1, begp1 + i);
-      Emchar c2 = BUF_FETCH_CHAR (bp2, begp2 + i);
+      Ichar c1 = BUF_FETCH_CHAR (bp1, begp1 + i);
+      Ichar c2 = BUF_FETCH_CHAR (bp2, begp2 + i);
       if (!NILP (trt))
 	{
 	  c1 = TRT_TABLE_OF (trt, c1);
@@ -1751,7 +1751,7 @@
 {
   /* This function can GC */
   Charbpos pos, stop;
-  Emchar fromc, toc;
+  Ichar fromc, toc;
   int mc_count;
   struct buffer *buf = current_buffer;
   int count = specpdl_depth ();
@@ -1832,7 +1832,7 @@
   int cnt = 0;		/* Number of changes made. */
   int mc_count;
   struct buffer *buf = current_buffer;
-  Emchar oc;
+  Ichar oc;

   get_buffer_range_char (buf, start, end, &pos, &stop, 0);
   mc_count = begin_multiple_change (buf, pos, stop);
@@ -1840,18 +1840,18 @@
     {
       Charcount size = string_char_length (table);
 #ifdef MULE
-      /* Under Mule, string_emchar(n) is O(n), so for large tables or
-         large regions it makes sense to create an array of Emchars.  */
+      /* Under Mule, string_ichar(n) is O(n), so for large tables or
+         large regions it makes sense to create an array of Ichars.  */
       if (size * (stop - pos) > 65536)
 	{
-	  Emchar *etable = alloca_array (Emchar, size);
-	  convert_intbyte_string_into_emchar_string
+	  Ichar *etable = alloca_array (Ichar, size);
+	  convert_ibyte_string_into_ichar_string
 	    (XSTRING_DATA (table), XSTRING_LENGTH (table), etable);
 	  for (; pos < stop && (oc = BUF_FETCH_CHAR (buf, pos), 1); pos++)
 	    {
 	      if (oc < size)
 		{
-		  Emchar nc = etable[oc];
+		  Ichar nc = etable[oc];
 		  if (nc != oc)
 		    {
 		      buffer_replace_char (buf, pos, nc, 0, 0);
@@ -1867,7 +1867,7 @@
 	    {
 	      if (oc < size)
 		{
-		  Emchar nc = string_emchar (table, oc);
+		  Ichar nc = string_ichar (table, oc);
 		  if (nc != oc)
 		    {
 		      buffer_replace_char (buf, pos, nc, 0, 0);
@@ -1890,7 +1890,7 @@
 	    retry:
 	      if (CHAR_OR_CHAR_INTP (replacement))
 		{
-		  Emchar nc = XCHAR_OR_CHAR_INT (replacement);
+		  Ichar nc = XCHAR_OR_CHAR_INT (replacement);
 		  if (nc != oc)
 		    {
 		      buffer_replace_char (buf, pos, nc, 0, 0);
@@ -1924,7 +1924,7 @@
 	retry2:
 	  if (CHAR_OR_CHAR_INTP (replacement))
 	    {
-	      Emchar nc = XCHAR_OR_CHAR_INT (replacement);
+	      Ichar nc = XCHAR_OR_CHAR_INT (replacement);
 	      if (nc != oc)
 		{
 		  buffer_replace_char (buf, pos, nc, 0, 0);
@@ -2230,7 +2230,7 @@
 */
        (character1, character2, buffer))
 {
-  Emchar x1, x2;
+  Ichar x1, x2;
   struct buffer *b = decode_buffer (buffer, 1);

   CHECK_CHAR_COERCE_INT (character1);
--- a/src/eldap.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/eldap.c	Wed Jun 05 09:58:45 2002 +0000
@@ -324,7 +324,7 @@
   err = ldap_bind_s (ld, ldap_binddn, ldap_passwd, ldap_auth);
   if (err != LDAP_SUCCESS)
     {
-      Intbyte *interrmess;
+      Ibyte *interrmess;
       EXTERNAL_TO_C_STRING (ldap_err2string (err), interrmess, Qnative);
       signal_error (Qprocess_error, "Failed binding to the server",
 		    build_intstring (interrmess));
--- a/src/emodules.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/emodules.c	Wed Jun 05 09:58:45 2002 +0000
@@ -351,7 +351,7 @@
   dlhandle = dll_open (soname);
   if (dlhandle == (dll_handle)0)
     {
-      Intbyte *dllerrint;
+      Ibyte *dllerrint;

       EXTERNAL_TO_C_STRING (dll_error (dlhandle), dllerrint, Qnative);
       signal_error (Qdll_error, "Opening dynamic module",
@@ -493,7 +493,7 @@
 emodules_doc_subr(const char *symname, const char *doc)
 {
   Bytecount len = strlen (symname);
-  Lisp_Object sym = oblookup (Vobarray, (const Intbyte *)symname, len);
+  Lisp_Object sym = oblookup (Vobarray, (const Ibyte *)symname, len);
   Lisp_Subr *subr;

   if (SYMBOLP(sym))
@@ -513,7 +513,7 @@
 emodules_doc_sym (const char *symname, const char *doc)
 {
   Bytecount len = strlen (symname);
-  Lisp_Object sym = oblookup (Vobarray, (const Intbyte *)symname, len);
+  Lisp_Object sym = oblookup (Vobarray, (const Ibyte *)symname, len);
   Lisp_Object docstr;
   struct gcpro gcpro1;
--- a/src/eval.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/eval.c	Wed Jun 05 09:58:45 2002 +0000
@@ -421,10 +421,10 @@
 print_subr (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
   Lisp_Subr *subr = XSUBR (obj);
-  const CIntbyte *header =
+  const CIbyte *header =
     (subr->max_args == UNEVALLED) ? "#<special-form " : "#<subr ";
-  const CIntbyte *name = subr_name (subr);
-  const CIntbyte *trailer = subr->prompt ? " (interactive)>" : ">";
+  const CIbyte *name = subr_name (subr);
+  const CIbyte *trailer = subr->prompt ? " (interactive)>" : ">";

   if (print_readably)
     printing_unreadable_object ("%s%s%s", header, name, trailer);
@@ -2454,7 +2454,7 @@
    to signal_error_1(). */

 Lisp_Object
-build_error_data (const CIntbyte *reason, Lisp_Object frob)
+build_error_data (const CIbyte *reason, Lisp_Object frob)
 {
   if (EQ (frob, Qunbound))
     frob = Qnil;
@@ -2469,13 +2469,13 @@
 }

 DOESNT_RETURN
-signal_error (Lisp_Object type, const CIntbyte *reason, Lisp_Object frob)
+signal_error (Lisp_Object type, const CIbyte *reason, Lisp_Object frob)
 {
   signal_error_1 (type, build_error_data (reason, frob));
 }

 void
-maybe_signal_error (Lisp_Object type, const CIntbyte *reason,
+maybe_signal_error (Lisp_Object type, const CIbyte *reason,
 		    Lisp_Object frob, Lisp_Object class,
 		    Error_Behavior errb)
 {
@@ -2486,14 +2486,14 @@
 }

 Lisp_Object
-signal_continuable_error (Lisp_Object type, const CIntbyte *reason,
+signal_continuable_error (Lisp_Object type, const CIbyte *reason,
 			  Lisp_Object frob)
 {
   return Fsignal (type, build_error_data (reason, frob));
 }

 Lisp_Object
-maybe_signal_continuable_error (Lisp_Object type, const CIntbyte *reason,
+maybe_signal_continuable_error (Lisp_Object type, const CIbyte *reason,
 				Lisp_Object frob, Lisp_Object class,
 				Error_Behavior errb)
 {
@@ -2515,7 +2515,7 @@
    but these are more convenient in this particular case.) */

 DOESNT_RETURN
-signal_error_2 (Lisp_Object type, const CIntbyte *reason,
+signal_error_2 (Lisp_Object type, const CIbyte *reason,
 		Lisp_Object frob0, Lisp_Object frob1)
 {
   signal_error_1 (type, list3 (build_msg_string (reason), frob0,
@@ -2523,7 +2523,7 @@
 }

 void
-maybe_signal_error_2 (Lisp_Object type, const CIntbyte *reason,
+maybe_signal_error_2 (Lisp_Object type, const CIbyte *reason,
 		      Lisp_Object frob0, Lisp_Object frob1,
 		      Lisp_Object class, Error_Behavior errb)
 {
@@ -2535,7 +2535,7 @@
 }

 Lisp_Object
-signal_continuable_error_2 (Lisp_Object type, const CIntbyte *reason,
+signal_continuable_error_2 (Lisp_Object type, const CIbyte *reason,
 			    Lisp_Object frob0, Lisp_Object frob1)
 {
   return Fsignal (type, list3 (build_msg_string (reason), frob0,
@@ -2543,7 +2543,7 @@
 }

 Lisp_Object
-maybe_signal_continuable_error_2 (Lisp_Object type, const CIntbyte *reason,
+maybe_signal_continuable_error_2 (Lisp_Object type, const CIbyte *reason,
 				  Lisp_Object frob0, Lisp_Object frob1,
 				  Lisp_Object class, Error_Behavior errb)
 {
@@ -2563,7 +2563,7 @@
    is a single string, created using the arguments. */

 DOESNT_RETURN
-signal_ferror (Lisp_Object type, const CIntbyte *fmt, ...)
+signal_ferror (Lisp_Object type, const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -2578,7 +2578,7 @@

 void
 maybe_signal_ferror (Lisp_Object type, Lisp_Object class, Error_Behavior errb,
-		     const CIntbyte *fmt, ...)
+		     const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -2596,7 +2596,7 @@
 }

 Lisp_Object
-signal_continuable_ferror (Lisp_Object type, const CIntbyte *fmt, ...)
+signal_continuable_ferror (Lisp_Object type, const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -2611,7 +2611,7 @@

 Lisp_Object
 maybe_signal_continuable_ferror (Lisp_Object type, Lisp_Object class,
-				 Error_Behavior errb, const CIntbyte *fmt, ...)
+				 Error_Behavior errb, const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -2644,7 +2644,7 @@
 */

 DOESNT_RETURN
-signal_ferror_with_frob (Lisp_Object type, Lisp_Object frob, const CIntbyte *fmt,
+signal_ferror_with_frob (Lisp_Object type, Lisp_Object frob, const CIbyte *fmt,
 			 ...)
 {
   Lisp_Object obj;
@@ -2661,7 +2661,7 @@
 void
 maybe_signal_ferror_with_frob (Lisp_Object type, Lisp_Object frob,
 			       Lisp_Object class, Error_Behavior errb,
-			       const CIntbyte *fmt, ...)
+			       const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -2681,7 +2681,7 @@

 Lisp_Object
 signal_continuable_ferror_with_frob (Lisp_Object type, Lisp_Object frob,
-				     const CIntbyte *fmt, ...)
+				     const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -2698,7 +2698,7 @@
 maybe_signal_continuable_ferror_with_frob (Lisp_Object type, Lisp_Object frob,
 					   Lisp_Object class,
 					   Error_Behavior errb,
-					   const CIntbyte *fmt, ...)
+					   const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -2786,161 +2786,161 @@
 }

 DOESNT_RETURN
-syntax_error (const CIntbyte *reason, Lisp_Object frob)
+syntax_error (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qsyntax_error, reason, frob);
 }

 DOESNT_RETURN
-syntax_error_2 (const CIntbyte *reason, Lisp_Object frob1, Lisp_Object frob2)
+syntax_error_2 (const CIbyte *reason, Lisp_Object frob1, Lisp_Object frob2)
 {
   signal_error_2 (Qsyntax_error, reason, frob1, frob2);
 }

 void
-maybe_syntax_error (const CIntbyte *reason, Lisp_Object frob,
+maybe_syntax_error (const CIbyte *reason, Lisp_Object frob,
 		    Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qsyntax_error, reason, frob, class, errb);
 }

 DOESNT_RETURN
-sferror (const CIntbyte *reason, Lisp_Object frob)
+sferror (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qstructure_formation_error, reason, frob);
 }

 DOESNT_RETURN
-sferror_2 (const CIntbyte *reason, Lisp_Object frob1, Lisp_Object frob2)
+sferror_2 (const CIbyte *reason, Lisp_Object frob1, Lisp_Object frob2)
 {
   signal_error_2 (Qstructure_formation_error, reason, frob1, frob2);
 }

 void
-maybe_sferror (const CIntbyte *reason, Lisp_Object frob,
+maybe_sferror (const CIbyte *reason, Lisp_Object frob,
 	       Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qstructure_formation_error, reason, frob, class, errb);
 }

 DOESNT_RETURN
-invalid_argument (const CIntbyte *reason, Lisp_Object frob)
+invalid_argument (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qinvalid_argument, reason, frob);
 }

 DOESNT_RETURN
-invalid_argument_2 (const CIntbyte *reason, Lisp_Object frob1,
+invalid_argument_2 (const CIbyte *reason, Lisp_Object frob1,
 		    Lisp_Object frob2)
 {
   signal_error_2 (Qinvalid_argument, reason, frob1, frob2);
 }

 void
-maybe_invalid_argument (const CIntbyte *reason, Lisp_Object frob,
+maybe_invalid_argument (const CIbyte *reason, Lisp_Object frob,
 			Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_argument, reason, frob, class, errb);
 }

 DOESNT_RETURN
-invalid_constant (const CIntbyte *reason, Lisp_Object frob)
+invalid_constant (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qinvalid_constant, reason, frob);
 }

 DOESNT_RETURN
-invalid_constant_2 (const CIntbyte *reason, Lisp_Object frob1,
+invalid_constant_2 (const CIbyte *reason, Lisp_Object frob1,
 		    Lisp_Object frob2)
 {
   signal_error_2 (Qinvalid_constant, reason, frob1, frob2);
 }

 void
-maybe_invalid_constant (const CIntbyte *reason, Lisp_Object frob,
+maybe_invalid_constant (const CIbyte *reason, Lisp_Object frob,
 			Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_constant, reason, frob, class, errb);
 }

 DOESNT_RETURN
-invalid_operation (const CIntbyte *reason, Lisp_Object frob)
+invalid_operation (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qinvalid_operation, reason, frob);
 }

 DOESNT_RETURN
-invalid_operation_2 (const CIntbyte *reason, Lisp_Object frob1,
+invalid_operation_2 (const CIbyte *reason, Lisp_Object frob1,
 		     Lisp_Object frob2)
 {
   signal_error_2 (Qinvalid_operation, reason, frob1, frob2);
 }

 void
-maybe_invalid_operation (const CIntbyte *reason, Lisp_Object frob,
+maybe_invalid_operation (const CIbyte *reason, Lisp_Object frob,
 			 Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_operation, reason, frob, class, errb);
 }

 DOESNT_RETURN
-invalid_change (const CIntbyte *reason, Lisp_Object frob)
+invalid_change (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qinvalid_change, reason, frob);
 }

 DOESNT_RETURN
-invalid_change_2 (const CIntbyte *reason, Lisp_Object frob1, Lisp_Object frob2)
+invalid_change_2 (const CIbyte *reason, Lisp_Object frob1, Lisp_Object frob2)
 {
   signal_error_2 (Qinvalid_change, reason, frob1, frob2);
 }

 void
-maybe_invalid_change (const CIntbyte *reason, Lisp_Object frob,
+maybe_invalid_change (const CIbyte *reason, Lisp_Object frob,
 		      Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_change, reason, frob, class, errb);
 }

 DOESNT_RETURN
-invalid_state (const CIntbyte *reason, Lisp_Object frob)
+invalid_state (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qinvalid_state, reason, frob);
 }

 DOESNT_RETURN
-invalid_state_2 (const CIntbyte *reason, Lisp_Object frob1, Lisp_Object frob2)
+invalid_state_2 (const CIbyte *reason, Lisp_Object frob1, Lisp_Object frob2)
 {
   signal_error_2 (Qinvalid_state, reason, frob1, frob2);
 }

 void
-maybe_invalid_state (const CIntbyte *reason, Lisp_Object frob,
+maybe_invalid_state (const CIbyte *reason, Lisp_Object frob,
 		     Lisp_Object class, Error_Behavior errb)
 {
   maybe_signal_error (Qinvalid_state, reason, frob, class, errb);
 }

 DOESNT_RETURN
-wtaerror (const CIntbyte *reason, Lisp_Object frob)
+wtaerror (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qwrong_type_argument, reason, frob);
 }

 DOESNT_RETURN
-stack_overflow (const CIntbyte *reason, Lisp_Object frob)
+stack_overflow (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qstack_overflow, reason, frob);
 }

 DOESNT_RETURN
-out_of_memory (const CIntbyte *reason, Lisp_Object frob)
+out_of_memory (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qout_of_memory, reason, frob);
 }

 DOESNT_RETURN
-printing_unreadable_object (const CIntbyte *fmt, ...)
+printing_unreadable_object (const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
@@ -4702,7 +4702,7 @@
   Lisp_Object backtrace;
   Lisp_Object warning_class;

-  const CIntbyte *warning_string;
+  const CIbyte *warning_string;
   Lisp_Object (*fun) (void *);
   void *arg;
 };
@@ -4906,7 +4906,7 @@

 Lisp_Object
 call_trapping_problems (Lisp_Object warning_class,
-			const CIntbyte *warning_string,
+			const CIbyte *warning_string,
 			int flags,
 			struct call_trapping_problems_result *problem,
 			Lisp_Object (*fun) (void *),
@@ -5076,7 +5076,7 @@

 Lisp_Object
 va_call_trapping_problems (Lisp_Object warning_class,
-			   const CIntbyte *warning_string,
+			   const CIbyte *warning_string,
 			   int flags,
 			   struct call_trapping_problems_result *problem,
 			   lisp_fn_t fun, int nargs, ...)
@@ -5187,7 +5187,7 @@

 static Lisp_Object
 calln_trapping_problems (Lisp_Object warning_class,
-			 const CIntbyte *warning_string, int flags,
+			 const CIbyte *warning_string, int flags,
 			 struct call_trapping_problems_result *problem,
 			 int nargs, Lisp_Object *args)
 {
@@ -5227,7 +5227,7 @@
    call_trapping_problems! */

 Lisp_Object
-call0_trapping_problems (const CIntbyte *warning_string, Lisp_Object function,
+call0_trapping_problems (const CIbyte *warning_string, Lisp_Object function,
 			 int flags)
 {
   return calln_trapping_problems (Qerror, warning_string, flags, 0, 1,
@@ -5235,7 +5235,7 @@
 }

 Lisp_Object
-call1_trapping_problems (const CIntbyte *warning_string, Lisp_Object function,
+call1_trapping_problems (const CIbyte *warning_string, Lisp_Object function,
 			 Lisp_Object object, int flags)
 {
   Lisp_Object args[2];
@@ -5248,7 +5248,7 @@
 }

 Lisp_Object
-call2_trapping_problems (const CIntbyte *warning_string, Lisp_Object function,
+call2_trapping_problems (const CIbyte *warning_string, Lisp_Object function,
 			 Lisp_Object object1, Lisp_Object object2,
 			 int flags)
 {
@@ -5263,7 +5263,7 @@
 }

 Lisp_Object
-call3_trapping_problems (const CIntbyte *warning_string, Lisp_Object function,
+call3_trapping_problems (const CIbyte *warning_string, Lisp_Object function,
 			 Lisp_Object object1, Lisp_Object object2,
 			 Lisp_Object object3, int flags)
 {
@@ -5279,7 +5279,7 @@
 }

 Lisp_Object
-call4_trapping_problems (const CIntbyte *warning_string, Lisp_Object function,
+call4_trapping_problems (const CIbyte *warning_string, Lisp_Object function,
 			 Lisp_Object object1, Lisp_Object object2,
 			 Lisp_Object object3, Lisp_Object object4,
 			 int flags)
@@ -5297,7 +5297,7 @@
 }

 Lisp_Object
-call5_trapping_problems (const CIntbyte *warning_string, Lisp_Object function,
+call5_trapping_problems (const CIbyte *warning_string, Lisp_Object function,
 			 Lisp_Object object1, Lisp_Object object2,
 			 Lisp_Object object3, Lisp_Object object4,
 			 Lisp_Object object5, int flags)
@@ -5334,7 +5334,7 @@
    call_trapping_problems! */

 Lisp_Object
-eval_in_buffer_trapping_problems (const CIntbyte *warning_string,
+eval_in_buffer_trapping_problems (const CIbyte *warning_string,
 				  struct buffer *buf, Lisp_Object form,
 				  int flags)
 {
@@ -5351,7 +5351,7 @@
 }

 Lisp_Object
-run_hook_trapping_problems (const CIntbyte *warning_string,
+run_hook_trapping_problems (const CIbyte *warning_string,
 			    Lisp_Object hook_symbol,
 			    int flags)
 {
@@ -5373,7 +5373,7 @@
    if an error occurs (but not a quit). */

 Lisp_Object
-safe_run_hook_trapping_problems (const CIntbyte *warning_string,
+safe_run_hook_trapping_problems (const CIbyte *warning_string,
 				 Lisp_Object hook_symbol,
 				 int flags)
 {
@@ -5420,7 +5420,7 @@
    call_trapping_problems! */

 Lisp_Object
-run_hook_with_args_in_buffer_trapping_problems (const CIntbyte *warning_string,
+run_hook_with_args_in_buffer_trapping_problems (const CIbyte *warning_string,
 						struct buffer *buf, int nargs,
 						Lisp_Object *args,
 						enum run_hooks_condition cond,
@@ -5457,7 +5457,7 @@
 }

 Lisp_Object
-run_hook_with_args_trapping_problems (const CIntbyte *warning_string,
+run_hook_with_args_trapping_problems (const CIbyte *warning_string,
 				      int nargs,
 				      Lisp_Object *args,
 				      enum run_hooks_condition cond,
@@ -5468,7 +5468,7 @@
 }

 Lisp_Object
-va_run_hook_with_args_trapping_problems (const CIntbyte *warning_string,
+va_run_hook_with_args_trapping_problems (const CIbyte *warning_string,
 					 Lisp_Object hook_var,
 					 int nargs, ...)
 {
@@ -5493,7 +5493,7 @@
 }

 Lisp_Object
-va_run_hook_with_args_in_buffer_trapping_problems (const CIntbyte *
+va_run_hook_with_args_in_buffer_trapping_problems (const CIbyte *
 						   warning_string,
 						   struct buffer *buf,
 						   Lisp_Object hook_var,
@@ -6179,7 +6179,7 @@
    automatically be called when it is safe to do so. */

 void
-warn_when_safe (Lisp_Object class, Lisp_Object level, const CIntbyte *fmt, ...)
+warn_when_safe (Lisp_Object class, Lisp_Object level, const CIbyte *fmt, ...)
 {
   Lisp_Object obj;
   va_list args;
--- a/src/event-Xt.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/event-Xt.c	Wed Jun 05 09:58:45 2002 +0000
@@ -287,7 +287,7 @@
     return Qnil;

 #ifdef MULE
-  return make_char (make_emchar (charset, code, 0));
+  return make_char (make_ichar (charset, code, 0));
 #else
   return make_char (code + 0x80);
 #endif
@@ -1050,7 +1050,7 @@
       {
 	/* Generate multiple emacs events */
 	struct device *d = get_device_from_display (event->display);
-        Emchar ch;
+        Ichar ch;
 	Lisp_Object instream, fb_instream;
 	Lstream *istr;
 	struct gcpro gcpro1, gcpro2;
@@ -1065,7 +1065,7 @@
 	istr = XLSTREAM (instream);

 	GCPRO2 (instream, fb_instream);
-        while ((ch = Lstream_get_emchar (istr)) != EOF)
+        while ((ch = Lstream_get_ichar (istr)) != EOF)
           {
             Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
 	    Lisp_Event *ev          = XEVENT (emacs_event);
@@ -1402,7 +1402,7 @@
 		    {
 		      len = strlen ((char*)data);
 		      hurl = dnd_url_hexify_string ((char *)data, "file:");
-		      l_item = make_string ((Intbyte *)hurl, strlen (hurl));
+		      l_item = make_string ((Ibyte *)hurl, strlen (hurl));
 		      l_dndlist = Fcons (l_item, l_dndlist);
 		      data += len + 1;
 		      xfree (hurl);
@@ -1412,8 +1412,8 @@
 		break;
 	      case DndText:
 		l_type = Qdragdrop_MIME;
-		l_dndlist = list1 ( list3 ( list1 ( make_string ((Intbyte *)"text/plain", 10) ),
-					    make_string ((Intbyte *)"8bit", 4),
+		l_dndlist = list1 ( list3 ( list1 ( make_string ((Ibyte *)"text/plain", 10) ),
+					    make_string ((Ibyte *)"8bit", 4),
 					    make_ext_string ((Extbyte *)data,
 							     strlen((char *)data),
 							     Qctext) ) );
@@ -1438,7 +1438,7 @@
 		{
 		  char *hurl = dnd_url_hexify_string ((char *) data, "file:");

-		  l_dndlist = list1 ( make_string ((Intbyte *)hurl,
+		  l_dndlist = list1 ( make_string ((Ibyte *)hurl,
 						   strlen (hurl)) );
 		  l_type = Qdragdrop_URL;

@@ -1454,8 +1454,8 @@
 		l_type = Qdragdrop_URL;
 		break;
 	      default: /* Unknown, RawData and any other type */
-		l_dndlist = list1 ( list3 ( list1 ( make_string ((Intbyte *)"application/octet-stream", 24) ),
-					    make_string ((Intbyte *)"8bit", 4),
+		l_dndlist = list1 ( list3 ( list1 ( make_string ((Ibyte *)"application/octet-stream", 24) ),
+					    make_string ((Ibyte *)"8bit", 4),
 					    make_ext_string ((Extbyte *)data,
 							     size,
 							     Qbinary) ) );
@@ -2960,7 +2960,7 @@
   SELECT_TYPE temp_mask;
   int infd = DEVICE_INFD (d);
   struct console *con = XCONSOLE (DEVICE_CONSOLE (d));
-  Emchar quit_char = CONSOLE_QUIT_CHAR (con);
+  Ichar quit_char = CONSOLE_QUIT_CHAR (con);

   FD_ZERO (&temp_mask);
   FD_SET (infd, &temp_mask);
@@ -2968,7 +2968,7 @@
   while (1)
     {
       Lisp_Object event;
-      Emchar the_char;
+      Ichar the_char;

       if (!poll_fds_for_input (temp_mask))
 	return;
--- a/src/event-gtk.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/event-gtk.c	Wed Jun 05 09:58:45 2002 +0000
@@ -445,7 +445,7 @@
   if (event->length != 1)
     {
       /* Generate multiple emacs events */
-      Emchar ch;
+      Ichar ch;
       Lisp_Object instream, fb_instream;
       Lstream *istr;
       struct gcpro gcpro1, gcpro2;
@@ -462,7 +462,7 @@
       istr = XLSTREAM (instream);

       GCPRO2 (instream, fb_instream);
-      while ((ch = Lstream_get_emchar (istr)) != EOF)
+      while ((ch = Lstream_get_ichar (istr)) != EOF)
 	{
 	  Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
 	  struct Lisp_Event *ev = XEVENT (emacs_event);
@@ -1008,7 +1008,7 @@
       /* Random filename */
       char *hurl = dnd_url_hexify_string (data->data, "file:");

-      l_dndlist = list1 (make_string ((Intbyte *)hurl, strlen (hurl)));
+      l_dndlist = list1 (make_string ((Ibyte *)hurl, strlen (hurl)));
       l_type = Qdragdrop_URL;

       xfree (hurl);
@@ -1553,7 +1553,7 @@
   SELECT_TYPE temp_mask;
   int infd = DEVICE_INFD (d);
   struct console *con = XCONSOLE (DEVICE_CONSOLE (d));
-  Emchar quit_char = CONSOLE_QUIT_CHAR (con);
+  Ichar quit_char = CONSOLE_QUIT_CHAR (con);

   FD_ZERO (&temp_mask);
   FD_SET (infd, &temp_mask);
@@ -1561,7 +1561,7 @@
   while (1)
     {
       Lisp_Object event;
-      Emchar the_char;
+      Ichar the_char;

       if (!poll_fds_for_input (temp_mask))
 	return;
--- a/src/event-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/event-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1769,8 +1769,8 @@
 	{
 	  DWORD len = DdeGetData (hdata, NULL, 0, 0);
 	  LPBYTE extcmd = (LPBYTE) ALLOCA (len + 1);
-	  Intbyte *cmd;
-	  Intbyte *end;
+	  Ibyte *cmd;
+	  Ibyte *end;
 	  struct gcpro gcpro1, gcpro2;
 	  Lisp_Object l_dndlist = Qnil;
 	  Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
@@ -2361,7 +2361,7 @@
 	  }
 	else	/* Normal keys & modifiers */
 	  {
-	    Emchar quit_ch =
+	    Ichar quit_ch =
 	      CONSOLE_QUIT_CHAR (XCONSOLE (mswindows_find_console (hwnd)));
 	    POINT pnt = { LOWORD (GetMessagePos()), HIWORD (GetMessagePos()) };
 	    MSG msg, tranmsg;
@@ -2426,8 +2426,8 @@
 		int mods_with_quit = mods;
 		int length;
 		Extbyte extchar[4];
-		Intbyte *intchar;
-		Emchar ch;
+		Ibyte *intchar;
+		Ichar ch;

 		if (XEUNICODE_P)
 		  {
@@ -2435,7 +2435,7 @@
 		    TO_INTERNAL_FORMAT (DATA, (extchar, length),
 					C_STRING_ALLOCA, (intchar),
 					Qmswindows_unicode);
-		    ch = charptr_emchar (intchar);
+		    ch = itext_ichar (intchar);
 		  }
 		else
 		  {
@@ -2447,7 +2447,7 @@
 				   the following */
 				((LCID) GetKeyboardLayout (0) & 0xFFFF),
 				NULL));
-		    ch = charptr_emchar (intchar);
+		    ch = itext_ichar (intchar);
 		    xfree (intchar);
 		  }

@@ -2565,7 +2565,7 @@
 				 (HKL) lcid);
 			    if (tounret > 0)
 			      {
-				Intbyte *intchar;
+				Ibyte *intchar;

 				TO_INTERNAL_FORMAT
 				  (DATA,
@@ -2573,7 +2573,7 @@
 				   C_STRING_ALLOCA, intchar,
 				   Qmswindows_unicode);
 				XEVENT (lastev)->event.key.alt_keychars[i] =
-				  charptr_emchar (intchar);
+				  itext_ichar (intchar);
 			      }
 			  }
 			else
@@ -2594,7 +2594,7 @@
 				   it's like WM_IME_CHAR: DBCS chars
 				   have the lead byte in bits 8-15 of
 				   the short. */
-				Intbyte *intchar;
+				Ibyte *intchar;
 				Extbyte mbstuff[2];
 				Bytecount mblength = 0;
 				WORD thechar = received_keys[tounret - 1];
@@ -2611,14 +2611,14 @@
 				   NULL);

 				XEVENT (lastev)->event.key.alt_keychars[i] =
-				  charptr_emchar (intchar);
+				  itext_ichar (intchar);
 				xfree (intchar);
 			      }
 			  }
 		      }
 		    else
 		      {
-			Emchar altch;
+			Ichar altch;

 			if (virtual_key >= 'A' && virtual_key <= 'Z')
 			  altch =
@@ -3354,7 +3354,7 @@
 	filecount = qxeDragQueryFile ((HDROP) wParam, 0xffffffff, NULL, 0);
 	for (i = 0; i < filecount; i++)
 	  {
-	    Intbyte *fname;
+	    Ibyte *fname;
 	    Extbyte *fname_ext;
 	    Bytecount fnamelen;
 	    Charcount len = qxeDragQueryFile ((HDROP) wParam, i, NULL, 0);
@@ -3545,7 +3545,7 @@
          HIMC imc = ImmGetContext (hwnd);
 	 Extbyte *result;
          Bytecount len;
-	 Intbyte *resultint, *endptr;
+	 Ibyte *resultint, *endptr;
 	 Bytecount lenint;
 	 int speccount;

@@ -3571,12 +3571,12 @@

 	 while (resultint < endptr)
 	   {
-	     Emchar ch = charptr_emchar (resultint);
+	     Ichar ch = itext_ichar (resultint);
 	      if (ch == ' ')
 		mswindows_enqueue_keypress_event (hwnd, QKspace, 0);
 	      else
 		mswindows_enqueue_keypress_event (hwnd, make_char (ch), 0);
-	     INC_CHARPTR (resultint);
+	     INC_IBYTEPTR (resultint);
 	   }

 	 unbind_to (speccount);
--- a/src/event-stream.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/event-stream.c	Wed Jun 05 09:58:45 2002 +0000
@@ -372,7 +372,7 @@
     {
       /* #### This badly needs to be turned into a Dynarr */
       builder->echo_buf_length = 300; /* #### Kludge */
-      builder->echo_buf = xnew_array (Intbyte, builder->echo_buf_length);
+      builder->echo_buf = xnew_array (Ibyte, builder->echo_buf_length);
       builder->echo_buf[0] = 0;
     }
   else
@@ -752,7 +752,7 @@
   /* This function can GC */
   DECLARE_EISTRING_MALLOC (buf);
   Bytecount buf_index = command_builder->echo_buf_index;
-  Intbyte *e;
+  Ibyte *e;
   Bytecount len;

   if (buf_index < 0)
@@ -859,7 +859,7 @@
 static void
 maybe_kbd_translate (Lisp_Object event)
 {
-  Emchar c;
+  Ichar c;
   int did_translate = 0;

   if (XEVENT_TYPE (event) != key_press_event)
@@ -3343,7 +3343,7 @@
     {
       Lisp_Object terminal = builder->most_current_event;
       struct key_data *key = &XEVENT (terminal)->event.key;
-      Emchar c = 0;
+      Ichar c = 0;
       if ((key->modifiers & XEMACS_MOD_SHIFT)
           || (CHAR_OR_CHAR_INTP (key->keysym)
               && ((c = XCHAR_OR_CHAR_INT (key->keysym)),
@@ -3432,7 +3432,7 @@
     {
       Lisp_Object keysym =
 	XEVENT (builder->most_current_event)->event.key.keysym;
-      if (CHARP (keysym) && !emchar_ascii_p (XCHAR (keysym)))
+      if (CHARP (keysym) && !ichar_ascii_p (XCHAR (keysym)))
         return Vcomposed_character_default_binding;
     }
 #endif
@@ -3902,7 +3902,7 @@

 		if (len + buf_index + 1 <= command_builder->echo_buf_length)
 		  {
-		    Intbyte *echo = command_builder->echo_buf + buf_index;
+		    Ibyte *echo = command_builder->echo_buf + buf_index;
 		    memcpy (echo, XSTRING_DATA (prompt), len);
 		    echo[len] = 0;
 		  }
@@ -4616,9 +4616,9 @@
       Lisp_Object keysym = XEVENT (event)->event.key.keysym;
       if (CHARP (XEVENT (event)->event.key.keysym))
 	{
-	  Emchar ch = XCHAR (keysym);
-	  Intbyte str[MAX_EMCHAR_LEN];
-	  Bytecount len = set_charptr_emchar (str, ch);
+	  Ichar ch = XCHAR (keysym);
+	  Ibyte str[MAX_ICHAR_LEN];
+	  Bytecount len = set_itext_ichar (str, ch);
 	  Lstream_write (XLSTREAM (Vdribble_file), str, len);
 	}
       else if (string_char_length (XSYMBOL (keysym)->name) == 1)
--- a/src/event-unixoid.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/event-unixoid.c	Wed Jun 05 09:58:45 2002 +0000
@@ -73,11 +73,11 @@
 int
 read_event_from_tty_or_stream_desc (Lisp_Event *event, struct console *con)
 {
-  Emchar ch;
+  Ichar ch;
   Lisp_Object console = wrap_console (con);

   if (CONSOLE_TTY_P (con))
-    ch = Lstream_get_emchar (XLSTREAM (CONSOLE_TTY_DATA (con)->instream));
+    ch = Lstream_get_ichar (XLSTREAM (CONSOLE_TTY_DATA (con)->instream));
   else
     {
       /* #### Definitely something strange here.  We should be setting
@@ -316,7 +316,7 @@
   /* FLAGS is process->pty_flag for UNIX_PROCESSES */
   if ((flags & STREAM_PTY_FLUSHING) && outfd >= 0)
     {
-      Intbyte eof_char = get_eof_char (outfd);
+      Ibyte eof_char = get_eof_char (outfd);
       int pty_max_bytes = get_pty_max_bytes (outfd);
       filedesc_stream_set_pty_flushing (XLSTREAM (*outstream), pty_max_bytes,
 					eof_char);
--- a/src/events.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/events.c	Wed Jun 05 09:58:45 2002 +0000
@@ -959,7 +959,7 @@


 void
-character_to_event (Emchar c, Lisp_Event *event, struct console *con,
+character_to_event (Ichar c, Lisp_Event *event, struct console *con,
 		    int use_console_meta_flag, int do_backspace_mapping)
 {
   Lisp_Object k = Qnil;
@@ -1038,13 +1038,13 @@
  */
 Lisp_Object Vcharacter_set_property;

-Emchar
+Ichar
 event_to_character (Lisp_Event *event,
 		    int allow_extra_modifiers,
 		    int allow_meta,
 		    int allow_non_ascii)
 {
-  Emchar c = 0;
+  Ichar c = 0;
   Lisp_Object code;

   if (event->event_type != key_press_event)
@@ -1122,7 +1122,7 @@
 */
      (event, allow_extra_modifiers, allow_meta, allow_non_ascii))
 {
-  Emchar c;
+  Ichar c;
   CHECK_LIVE_EVENT (event);
   c = event_to_character (XEVENT (event),
 			  !NILP (allow_extra_modifiers),
@@ -1187,7 +1187,7 @@

   if (STRINGP (seq))
     {
-      Emchar ch = string_emchar (seq, n);
+      Ichar ch = string_ichar (seq, n);
       Fcharacter_to_event (make_char (ch), event, Qnil, Qnil);
     }
   else
--- a/src/events.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/events.h	Wed Jun 05 09:58:45 2002 +0000
@@ -288,7 +288,7 @@
      *ONLY* in alt_keychars for all control keys.  What about the
      English speaker who temporarily switches to the French layout and
      finds C-q mapped to C-a?) */
-  Emchar alt_keychars[KEYCHAR_LAST];
+  Ichar alt_keychars[KEYCHAR_LAST];
 #endif /* MULE */
 };

@@ -595,7 +595,7 @@

 /* from events.c */
 void format_event_object (Eistring *buf, Lisp_Event *event, int brief);
-void character_to_event (Emchar c, Lisp_Event *event,
+void character_to_event (Ichar c, Lisp_Event *event,
                          struct console *con,
                          int use_console_meta_flag,
                          int do_backspace_mapping);
@@ -620,7 +620,7 @@
    (keyboard press, menu, scrollbar, mouse button) */
 int command_event_p (Lisp_Object event);
 void define_self_inserting_symbol (Lisp_Object, Lisp_Object);
-Emchar event_to_character (Lisp_Event *, int, int, int);
+Ichar event_to_character (Lisp_Event *, int, int, int);
 struct console *event_console_or_selected (Lisp_Object event);

 /* from event-stream.c */
@@ -784,7 +784,7 @@
     Lisp_Object first_mungeable_event;
   } munge_me[2];

-  Intbyte *echo_buf;
+  Ibyte *echo_buf;
   Bytecount echo_buf_length;          /* size of echo_buf */
   Bytecount echo_buf_index;           /* index into echo_buf
                                        * -1 before doing echoing for new cmd */
--- a/src/file-coding.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/file-coding.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1018,9 +1018,9 @@
 setup_eol_coding_systems (Lisp_Object codesys)
 {
   int len = XSTRING_LENGTH (XSYMBOL (XCODING_SYSTEM_NAME (codesys))->name);
-  Intbyte *codesys_name = (Intbyte *) ALLOCA (len + 7);
+  Ibyte *codesys_name = (Ibyte *) ALLOCA (len + 7);
   int mlen = -1;
-  Intbyte *codesys_mnemonic = 0;
+  Ibyte *codesys_mnemonic = 0;
   Lisp_Object codesys_name_sym, sub_codesys;
   int i;

@@ -1030,7 +1030,7 @@
   if (STRINGP (XCODING_SYSTEM_MNEMONIC (codesys)))
     {
       mlen = XSTRING_LENGTH (XCODING_SYSTEM_MNEMONIC (codesys));
-      codesys_mnemonic = (Intbyte *) ALLOCA (mlen + 7);
+      codesys_mnemonic = (Ibyte *) ALLOCA (mlen + 7);
       memcpy (codesys_mnemonic,
 	      XSTRING_DATA (XCODING_SYSTEM_MNEMONIC (codesys)), mlen);
     }
@@ -1144,10 +1144,10 @@

   if (prefix)
     {
-      Intbyte *newname =
+      Ibyte *newname =
 	emacs_sprintf_malloc (NULL, "%s-%s-%d",
 			      prefix,
-			      NILP (name_or_existing) ? (Intbyte *) "nil" :
+			      NILP (name_or_existing) ? (Ibyte *) "nil" :
 			      XSTRING_DATA (Fsymbol_name (XCODING_SYSTEM_NAME
 							  (name_or_existing))),
 			      ++coding_system_tick);
@@ -1262,7 +1262,7 @@
 	   creating will have canonicalization expansion done on it,
 	   leading to infinite recursion.  So we have to generate a new,
 	   internal coding system with the previous value of CANONICAL. */
-	Intbyte *newname =
+	Ibyte *newname =
 	  emacs_sprintf_malloc
 	    (NULL, "internal-eol-copy-%s-%d",
 	     XSTRING_DATA (Fsymbol_name (name_or_existing)),
@@ -2950,7 +2950,7 @@
 	      Dynarr_add (dst, c);
 	    }
 #ifdef MULE
-	  else if (intbyte_leading_byte_p (c))
+	  else if (ibyte_leading_byte_p (c))
 	    {
 	      assert (ch == 0);
 	      if (c == LEADING_BYTE_LATIN_ISO8859_1 ||
@@ -3110,7 +3110,7 @@
 }

 static Bytecount
-convert_eol_convert (struct coding_stream *str, const Intbyte *src,
+convert_eol_convert (struct coding_stream *str, const Ibyte *src,
 		     unsigned_char_dynarr *dst, Bytecount n)
 {
   if (str->direction == CODING_DECODE)
@@ -3121,11 +3121,11 @@
       if (data->actual == EOL_AUTODETECT)
 	{
 	  Bytecount n2 = n;
-	  const Intbyte *src2 = src;
+	  const Ibyte *src2 = src;

 	  for (; n2; n2--)
 	    {
-	      Intbyte c = *src2++;
+	      Ibyte c = *src2++;
 	      if (c == '\n')
 		{
 		  data->actual = EOL_LF;
@@ -3164,12 +3164,12 @@
 	Dynarr_add_many (dst, src, n);
       else
 	{
-	  const Intbyte *end = src + n;
+	  const Ibyte *end = src + n;
 	  while (1)
 	    {
 	      /* Find the next section with no \r and add it. */
-	      const Intbyte *runstart = src;
-	      src = (Intbyte *) memchr (src, '\r', end - src);
+	      const Ibyte *runstart = src;
+	      src = (Ibyte *) memchr (src, '\r', end - src);
 	      if (!src)
 		src = end;
 	      Dynarr_add_many (dst, runstart, src - runstart);
@@ -3201,7 +3201,7 @@
     {
       enum eol_type subtype =
 	XCODING_SYSTEM_CONVERT_EOL_SUBTYPE (str->codesys);
-      const Intbyte *end = src + n;
+      const Ibyte *end = src + n;

       /* We try to be relatively efficient here. */
       if (subtype == EOL_LF)
@@ -3211,8 +3211,8 @@
 	  while (1)
 	    {
 	      /* Find the next section with no \n and add it. */
-	      const Intbyte *runstart = src;
-	      src = (Intbyte *) memchr (src, '\n', end - src);
+	      const Ibyte *runstart = src;
+	      src = (Ibyte *) memchr (src, '\n', end - src);
 	      if (!src)
 		src = end;
 	      Dynarr_add_many (dst, runstart, src - runstart);
@@ -3789,11 +3789,11 @@
 			    *(p-1) == ';')))
 		  {
 		    Bytecount n;
-		    Intbyte *name;
+		    Ibyte *name;

 		    p += LENGTH ("coding:");
 		    while (*p == ' ' || *p == '\t') p++;
-		    name = alloca_intbytes (suffix - p + 1);
+		    name = alloca_ibytes (suffix - p + 1);
 		    memcpy (name, p, suffix - p);
 		    name[suffix - p] = '\0';
--- a/src/file-coding.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/file-coding.h	Wed Jun 05 09:58:45 2002 +0000
@@ -1057,7 +1057,7 @@
 void set_coding_stream_coding_system (Lstream *stream,
 				      Lisp_Object codesys);
 Lisp_Object detect_coding_stream (Lisp_Object stream);
-Emchar decode_big5_char (int o1, int o2);
+Ichar decode_big5_char (int o1, int o2);
 void add_entry_to_coding_system_type_list (struct coding_system_methods *m);
 Lisp_Object make_internal_coding_system (Lisp_Object existing,
 					 Char_ASCII *prefix,
--- a/src/fileio.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/fileio.c	Wed Jun 05 09:58:45 2002 +0000
@@ -134,7 +134,7 @@

 DOESNT_RETURN
 report_file_type_error (Lisp_Object errtype, Lisp_Object oserrmess,
-			const CIntbyte *string, Lisp_Object data)
+			const CIbyte *string, Lisp_Object data)
 {
   struct gcpro gcpro1;
   Lisp_Object errdata = build_error_data (NULL, data);
@@ -148,7 +148,7 @@

 DOESNT_RETURN
 report_error_with_errno (Lisp_Object errtype,
-			 const CIntbyte *string, Lisp_Object data)
+			 const CIbyte *string, Lisp_Object data)
 {
   report_file_type_error (errtype, lisp_strerror (errno), string, data);
 }
@@ -156,7 +156,7 @@
 /* signal a file error when errno contains a meaningful value. */

 DOESNT_RETURN
-report_file_error (const CIntbyte *string, Lisp_Object data)
+report_file_error (const CIbyte *string, Lisp_Object data)
 {
   report_error_with_errno (Qfile_error, string, data);
 }
@@ -171,7 +171,7 @@
   Extbyte *ret = strerror (errnum);
   if (!ret)
     {
-      Intbyte ffff[99];
+      Ibyte ffff[99];
       qxesprintf (ffff, "Unknown error %d", errnum);
       return build_intstring (ffff);
     }
@@ -332,8 +332,8 @@
 {
   /* This function can GC.  GC checked 2000-07-28 ben */
   /* This function synched with Emacs 21.0.103. */
-  Intbyte *beg;
-  Intbyte *p;
+  Ibyte *beg;
+  Ibyte *p;
   Lisp_Object handler;

   CHECK_STRING (filename);
@@ -367,10 +367,10 @@
   /* Expansion of "c:" to drive and default directory.  */
   if (p[-1] == ':')
     {
-      Intbyte *res;
-      Intbyte *wd = mswindows_getdcwd (toupper (*beg) - 'A' + 1);
+      Ibyte *res;
+      Ibyte *wd = mswindows_getdcwd (toupper (*beg) - 'A' + 1);

-      res = alloca_array (Intbyte,
+      res = alloca_array (Ibyte,
 			  (wd ? qxestrlen (wd) : 0) + 10); /* go overboard */
       if (p == beg + 4 && IS_DIRECTORY_SEP (*beg) && beg[1] == ':')
 	{
@@ -382,7 +382,7 @@
 	{
 	  qxestrcat (res, wd);
 	  if (!IS_DIRECTORY_SEP (res[qxestrlen (res) - 1]))
-	    qxestrcat (res, (Intbyte *) "/");
+	    qxestrcat (res, (Ibyte *) "/");
 	  beg = res;
 	  p = beg + qxestrlen (beg);
 	}
@@ -395,7 +395,7 @@
 	 an analogous call in FSF 21. */
   {
     Bytecount len = p - beg;
-    Intbyte *newbeg = alloca_intbytes (len + 1);
+    Ibyte *newbeg = alloca_ibytes (len + 1);
     Lisp_Object return_me;

     qxestrncpy (newbeg, beg, len);
@@ -420,7 +420,7 @@
 {
   /* This function can GC.  GC checked 2000-07-28 ben */
   /* This function synched with Emacs 21.0.103. */
-  Intbyte *beg, *p, *end;
+  Ibyte *beg, *p, *end;
   Lisp_Object handler;

   CHECK_STRING (filename);
@@ -472,8 +472,8 @@
 }


-static Intbyte *
-file_name_as_directory (Intbyte *out, Intbyte *in)
+static Ibyte *
+file_name_as_directory (Ibyte *out, Ibyte *in)
 {
   /* This function cannot GC */
   int size = qxestrlen (in);
@@ -509,7 +509,7 @@
        (filename))
 {
   /* This function can GC.  GC checked 2000-07-28 ben */
-  Intbyte *buf;
+  Ibyte *buf;
   Lisp_Object handler;

   CHECK_STRING (filename);
@@ -520,7 +520,7 @@
   if (!NILP (handler))
     return call2_check_string (handler, Qfile_name_as_directory, filename);

-  buf = alloca_intbytes (XSTRING_LENGTH (filename) + 10);
+  buf = alloca_ibytes (XSTRING_LENGTH (filename) + 10);
   return build_intstring (file_name_as_directory (buf, XSTRING_DATA (filename)));
 }

@@ -532,7 +532,7 @@
  */

 static int
-directory_file_name (const Intbyte *src, Intbyte *dst)
+directory_file_name (const Ibyte *src, Ibyte *dst)
 {
   /* This function cannot GC */
   long slen = qxestrlen (src);
@@ -559,7 +559,7 @@
        (directory))
 {
   /* This function can GC.  GC checked 2000-07-28 ben */
-  Intbyte *buf;
+  Ibyte *buf;
   Lisp_Object handler;

   CHECK_STRING (directory);
@@ -574,7 +574,7 @@
   handler = Ffind_file_name_handler (directory, Qdirectory_file_name);
   if (!NILP (handler))
     return call2_check_string (handler, Qdirectory_file_name, directory);
-  buf = (Intbyte *) ALLOCA (XSTRING_LENGTH (directory) + 20);
+  buf = (Ibyte *) ALLOCA (XSTRING_LENGTH (directory) + 20);
   directory_file_name (XSTRING_DATA (directory), buf);
   return build_intstring (buf);
 }
@@ -617,7 +617,7 @@
   };

   Bytecount len;
-  Intbyte *p, *data;
+  Ibyte *p, *data;
   Lisp_Object handler;

   CHECK_STRING (prefix);
@@ -641,7 +641,7 @@
      that's less of a concern. --ben */

   len = XSTRING_LENGTH (prefix);
-  data = alloca_intbytes (len + 7);
+  data = alloca_ibytes (len + 7);
   memcpy (data, XSTRING_DATA (prefix), len);
   p = data + len;
   p[6] = '\0';
@@ -715,11 +715,11 @@
 {
   /* This function can GC.  GC-checked 2000-11-18.
      This function synched with Emacs 21.0.103. */
-  Intbyte *nm;
-
-  Intbyte *newdir, *p, *o;
+  Ibyte *nm;
+
+  Ibyte *newdir, *p, *o;
   int tlen;
-  Intbyte *target;
+  Ibyte *target;
 #ifdef WIN32_FILENAMES
   int drive = 0;
   int collapse_newdir = 1;
@@ -807,7 +807,7 @@
 #ifdef WIN32_FILENAMES
   /* We will force directory separators to be either all \ or /, so make
      a local copy to modify, even if there ends up being no change. */
-  nm = qxestrcpy (alloca_intbytes (qxestrlen (nm) + 1), nm);
+  nm = qxestrcpy (alloca_ibytes (qxestrlen (nm) + 1), nm);

   /* Note if special escape prefix is present, but remove for now.  */
   if (nm[0] == '/' && nm[1] == ':')
@@ -819,7 +819,7 @@
   /* Find and remove drive specifier if present; this makes nm absolute
      even if the rest of the name appears to be relative. */
   {
-    Intbyte *colon = qxestrrchr (nm, ':');
+    Ibyte *colon = qxestrrchr (nm, ':');

     if (colon)
       {
@@ -906,7 +906,7 @@
 #ifdef WIN32_FILENAMES
 	  if (drive || IS_DIRECTORY_SEP (nm[1]))
 	    {
-	      Intbyte *newnm;
+	      Ibyte *newnm;

 	      if (IS_DIRECTORY_SEP (nm[1]))
 		{
@@ -960,10 +960,10 @@
       if (IS_DIRECTORY_SEP (nm[1])
 	  || nm[1] == 0)	/* ~ by itself */
 	{
-	  Intbyte *homedir = get_home_directory ();
+	  Ibyte *homedir = get_home_directory ();

 	  if (!homedir)
-	    newdir = (Intbyte *) "";
+	    newdir = (Ibyte *) "";
 	  else
 	    newdir = homedir;

@@ -976,7 +976,7 @@
 	{
 	  for (p = nm; *p && (!IS_DIRECTORY_SEP (*p)); p++)
 	    DO_NOTHING;
-	  o = (Intbyte *) ALLOCA (p - nm + 1);
+	  o = (Ibyte *) ALLOCA (p - nm + 1);
 	  memcpy (o, nm, p - nm);
 	  o [p - nm] = 0;

@@ -987,7 +987,7 @@
 #ifndef WIN32_NATIVE
 #ifdef CYGWIN
 	  {
-	    Intbyte *user;
+	    Ibyte *user;

 	    if ((user = user_login_name (NULL)) != NULL)
 	      {
@@ -1009,7 +1009,7 @@
 	  speed_up_interrupts ();
 	  if (pw)
 	    {
-	      newdir = (Intbyte *) pw->pw_dir;
+	      newdir = (Ibyte *) pw->pw_dir;
 	      nm = p;
 	      /* FSF: if WIN32_NATIVE, collapse_newdir = 0;
 		 not possible here. */
@@ -1033,10 +1033,10 @@
       /* Get default directory if needed to make nm absolute. */
       if (!IS_DIRECTORY_SEP (nm[0]))
 	{
-	  Intbyte *newcwd = mswindows_getdcwd (toupper (drive) - 'A' + 1);
+	  Ibyte *newcwd = mswindows_getdcwd (toupper (drive) - 'A' + 1);
 	  if (newcwd)
 	    {
-	      INTBYTE_STRING_TO_ALLOCA (newcwd, newdir);
+	      IBYTE_STRING_TO_ALLOCA (newcwd, newdir);
 	      xfree (newcwd);
 	    }
 	  else
@@ -1046,7 +1046,7 @@
       if (!newdir)
 	{
 	  /* Either nm starts with /, or drive isn't mounted. */
-	  newdir = (Intbyte *) ALLOCA (4);
+	  newdir = (Ibyte *) ALLOCA (4);
 	  newdir[0] = DRIVE_LETTER (drive);
 	  newdir[1] = ':';
 	  newdir[2] = '/';
@@ -1110,7 +1110,7 @@
 	    }
 	  if (!IS_DIRECTORY_SEP (nm[0]))
 	    {
-	      Intbyte *tmp = (Intbyte *) ALLOCA (qxestrlen (newdir) +
+	      Ibyte *tmp = (Ibyte *) ALLOCA (qxestrlen (newdir) +
 						 qxestrlen (nm) + 2);
 	      file_name_as_directory (tmp, newdir);
 	      qxestrcat (tmp, nm);
@@ -1119,18 +1119,18 @@
 	  if (drive)
 	    {
 #ifdef WIN32_NATIVE
-	      Intbyte *newcwd = mswindows_getdcwd (toupper (drive) - 'A' + 1);
+	      Ibyte *newcwd = mswindows_getdcwd (toupper (drive) - 'A' + 1);
 	      if (newcwd)
 		{
-		  INTBYTE_STRING_TO_ALLOCA (newcwd, newdir);
+		  IBYTE_STRING_TO_ALLOCA (newcwd, newdir);
 		  xfree (newcwd);
 		}
 	      else
 #endif
-		INTBYTE_STRING_TO_ALLOCA ((Intbyte *) "/", newdir);
+		IBYTE_STRING_TO_ALLOCA ((Ibyte *) "/", newdir);
 	    }
 	  else
-	    INTBYTE_STRING_TO_ALLOCA (get_initial_directory (0, 0), newdir);
+	    IBYTE_STRING_TO_ALLOCA (get_initial_directory (0, 0), newdir);
 	}

       /* Strip off drive name from prefix, if present. */
@@ -1151,8 +1151,8 @@
 	  if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1]))
 	    {
 	      newdir =
-		(Intbyte *)
-		  qxestrcpy ((Intbyte *) ALLOCA (qxestrlen (newdir) + 1),
+		(Ibyte *)
+		  qxestrcpy ((Ibyte *) ALLOCA (qxestrlen (newdir) + 1),
 			     newdir);
 	      p = newdir + 2;
 	      while (*p && !IS_DIRECTORY_SEP (*p)) p++;
@@ -1161,7 +1161,7 @@
 	      *p = 0;
 	    }
 	  else
-	    newdir = (Intbyte *) "";
+	    newdir = (Ibyte *) "";
 	}
     }
 #endif /* WIN32_FILENAMES */
@@ -1177,7 +1177,7 @@
 #endif
 	  )
 	{
-	  Intbyte *temp = (Intbyte *) ALLOCA (length);
+	  Ibyte *temp = (Ibyte *) ALLOCA (length);
 	  memcpy (temp, newdir, length - 1);
 	  temp[length - 1] = 0;
 	  newdir = temp;
@@ -1193,10 +1193,10 @@
   /* Reserve space for drive specifier and escape prefix, since either
      or both may need to be inserted.  (The Microsoft x86 compiler
      produces incorrect code if the following two lines are combined.)  */
-  target = (Intbyte *) ALLOCA (tlen + 4);
+  target = (Ibyte *) ALLOCA (tlen + 4);
   target += 4;
 #else  /* not WIN32_FILENAMES */
-  target = (Intbyte *) ALLOCA (tlen);
+  target = (Ibyte *) ALLOCA (tlen);
 #endif /* not WIN32_FILENAMES */
   *target = 0;

@@ -1297,7 +1297,7 @@
   *o = '\0';

   {
-    Intbyte *newtarget = mswindows_canonicalize_filename (target);
+    Ibyte *newtarget = mswindows_canonicalize_filename (target);
     Lisp_Object result = build_intstring (newtarget);
     xfree (newtarget);

@@ -1341,10 +1341,10 @@
   }

   {
-    Intbyte resolved_path[PATH_MAX];
+    Ibyte resolved_path[PATH_MAX];
     Bytecount elen = XSTRING_LENGTH (expanded_name);
-    Intbyte *path;
-    Intbyte *p;
+    Ibyte *path;
+    Ibyte *p;

     LISP_STRING_TO_ALLOCA (expanded_name, path);
     p = path;
@@ -1372,7 +1372,7 @@
 	   realpath()s, we just use our own version in realpath.c. */
 	for (;;)
 	  {
-	    Intbyte *pos;
+	    Ibyte *pos;

 #ifdef WIN32_FILENAMES
 	    if (IS_DRIVE (p[0]) && IS_DEVICE_SEP (p[1])
@@ -1466,13 +1466,13 @@
        (filename))
 {
   /* This function can GC.  GC checked 2000-07-28 ben. */
-  Intbyte *nm;
-
-  Intbyte *s, *p, *o, *x, *endp;
-  Intbyte *target = 0;
+  Ibyte *nm;
+
+  Ibyte *s, *p, *o, *x, *endp;
+  Ibyte *target = 0;
   int total = 0;
   int substituted = 0;
-  Intbyte *xnm;
+  Ibyte *xnm;
   Lisp_Object handler;

   CHECK_STRING (filename);
@@ -1550,7 +1550,7 @@
 	  }

 	/* Copy out the variable name */
-	target = (Intbyte *) ALLOCA (s - o + 1);
+	target = (Ibyte *) ALLOCA (s - o + 1);
 	qxestrncpy (target, o, s - o);
 	target[s - o] = 0;
 #ifdef WIN32_NATIVE
@@ -1558,7 +1558,7 @@
 #endif /* WIN32_NATIVE */

 	/* Get variable value */
-	o = egetenv ((CIntbyte *) target);
+	o = egetenv ((CIbyte *) target);
 	if (!o) goto badvar;
 	total += qxestrlen (o);
 	substituted = 1;
@@ -1569,7 +1569,7 @@

   /* If substitution required, recopy the filename and do it */
   /* Make space in stack frame for the new copy */
-  xnm = (Intbyte *) ALLOCA (XSTRING_LENGTH (filename) + total + 1);
+  xnm = (Ibyte *) ALLOCA (XSTRING_LENGTH (filename) + total + 1);
   x = xnm;

   /* Copy the rest of the name through, replacing $ constructs with values */
@@ -1601,7 +1601,7 @@
 	  }

 	/* Copy out the variable name */
-	target = (Intbyte *) ALLOCA (s - o + 1);
+	target = (Ibyte *) ALLOCA (s - o + 1);
 	qxestrncpy (target, o, s - o);
 	target[s - o] = 0;
 #ifdef WIN32_NATIVE
@@ -1609,7 +1609,7 @@
 #endif /* WIN32_NATIVE */

 	/* Get variable value */
-	o = egetenv ((CIntbyte *) target);
+	o = egetenv ((CIbyte *) target);
 	if (!o)
 	  goto badvar;

@@ -2204,7 +2204,7 @@
        (filename))
 {
   /* This function does not GC */
-  Intbyte *ptr;
+  Ibyte *ptr;

   CHECK_STRING (filename);
   ptr = XSTRING_DATA (filename);
@@ -2240,7 +2240,7 @@
 /* Return nonzero if file FILENAME exists and can be written.  */

 static int
-check_writable (const Intbyte *filename)
+check_writable (const Ibyte *filename)
 {
 #ifdef HAVE_EACCESS
   return (qxe_eaccess (filename, W_OK) >= 0);
@@ -2379,7 +2379,7 @@
   GCPRO1 (abspath);
   dir = Ffile_name_directory (abspath);
   UNGCPRO;
-  return (check_writable (!NILP (dir) ? XSTRING_DATA (dir) : (Intbyte *) "")
+  return (check_writable (!NILP (dir) ? XSTRING_DATA (dir) : (Ibyte *) "")
 	  ? Qt : Qnil);
 }

@@ -2393,7 +2393,7 @@
   /* This function can GC.  GC checked 1997.04.10. */
   /* XEmacs change: run handlers even if local machine doesn't have symlinks */
 #ifdef HAVE_READLINK
-  Intbyte *buf;
+  Ibyte *buf;
   int bufsize;
   int valsize;
   Lisp_Object val;
@@ -2416,7 +2416,7 @@
   bufsize = 100;
   while (1)
     {
-      buf = xnew_array_and_zero (Intbyte, bufsize);
+      buf = xnew_array_and_zero (Ibyte, bufsize);
       valsize = qxe_readlink (XSTRING_DATA (filename),
 			      buf, bufsize);
       if (valsize < bufsize) break;
@@ -2730,7 +2730,7 @@
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
   Lisp_Object handler = Qnil, val;
   int total;
-  Intbyte read_buf[READ_BUF_SIZE];
+  Ibyte read_buf[READ_BUF_SIZE];
   int mc_count;
   struct buffer *buf = current_buffer;
   Lisp_Object curbuf;
@@ -3594,14 +3594,14 @@
 	nextpos = INT_MAX;
 #ifdef MULE
       /* If there are annotations left and we have Mule, then we
-	 have to do the I/O one emchar at a time so we can
+	 have to do the I/O one ichar at a time so we can
 	 determine when to insert the annotation. */
       if (!NILP (*annot))
 	{
-	  Emchar ch;
-	  while (pos != nextpos && (ch = Lstream_get_emchar (instr)) != EOF)
+	  Ichar ch;
+	  while (pos != nextpos && (ch = Lstream_get_ichar (instr)) != EOF)
 	    {
-	      if (Lstream_put_emchar (outstr, ch) < 0)
+	      if (Lstream_put_ichar (outstr, ch) < 0)
 		return -1;
 	      pos++;
 	    }
--- a/src/filelock.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/filelock.c	Wed Jun 05 09:58:45 2002 +0000
@@ -78,8 +78,8 @@

 typedef struct
 {
-  Intbyte *user;
-  Intbyte *host;
+  Ibyte *user;
+  Ibyte *host;
   pid_t pid;
 } lock_info_type;

@@ -93,14 +93,14 @@
 /* Write the name of the lock file for FN into LFNAME.  Length will be
    that of FN plus two more for the leading `.#' plus one for the null.  */
 #define MAKE_LOCK_NAME(lock, file) \
-  (lock = (Intbyte *) ALLOCA (XSTRING_LENGTH (file) + 2 + 1), \
+  (lock = (Ibyte *) ALLOCA (XSTRING_LENGTH (file) + 2 + 1), \
    fill_in_lock_file_name (lock, file))

 static void
-fill_in_lock_file_name (Intbyte *lockfile, Lisp_Object fn)
+fill_in_lock_file_name (Ibyte *lockfile, Lisp_Object fn)
 {
-  Intbyte *file_name = XSTRING_DATA (fn);
-  Intbyte *p;
+  Ibyte *file_name = XSTRING_DATA (fn);
+  Ibyte *p;
   Bytecount dirlen;

   for (p = file_name + XSTRING_LENGTH (fn) - 1;
@@ -121,24 +121,24 @@
    Return 1 if successful, 0 if not.  */

 static int
-lock_file_1 (Intbyte *lfname, int force)
+lock_file_1 (Ibyte *lfname, int force)
 {
   /* Does not GC. */
   int err;
-  Intbyte *lock_info_str;
-  Intbyte *host_name;
-  Intbyte *user_name = user_login_name (NULL);
+  Ibyte *lock_info_str;
+  Ibyte *host_name;
+  Ibyte *user_name = user_login_name (NULL);

   if (user_name == NULL)
-    user_name = (Intbyte *) "";
+    user_name = (Ibyte *) "";

   if (STRINGP (Vsystem_name))
     host_name = XSTRING_DATA (Vsystem_name);
   else
-    host_name = (Intbyte *) "";
+    host_name = (Ibyte *) "";

   lock_info_str =
-    (Intbyte *) ALLOCA (qxestrlen (user_name) + qxestrlen (host_name)
+    (Ibyte *) ALLOCA (qxestrlen (user_name) + qxestrlen (host_name)
 			+ LOCK_PID_MAX + 5);

   qxesprintf (lock_info_str, "%s@%s.%d", user_name, host_name, qxe_getpid ());
@@ -159,20 +159,20 @@
    or -1 if something is wrong with the locking mechanism.  */

 static int
-current_lock_owner (lock_info_type *owner, Intbyte *lfname)
+current_lock_owner (lock_info_type *owner, Ibyte *lfname)
 {
   /* Does not GC. */
   int len, ret;
   int local_owner = 0;
-  Intbyte *at, *dot;
-  Intbyte *lfinfo = 0;
+  Ibyte *at, *dot;
+  Ibyte *lfinfo = 0;
   int bufsize = 50;
   /* Read arbitrarily-long contents of symlink.  Similar code in
      file-symlink-p in fileio.c.  */
   do
     {
       bufsize *= 2;
-      lfinfo = (Intbyte *) xrealloc (lfinfo, bufsize);
+      lfinfo = (Ibyte *) xrealloc (lfinfo, bufsize);
       len = qxe_readlink (lfname, lfinfo, bufsize);
     }
   while (len >= bufsize);
@@ -204,16 +204,16 @@
     return -1;
   }
   len = at - lfinfo;
-  owner->user = (Intbyte *) xmalloc (len + 1);
+  owner->user = (Ibyte *) xmalloc (len + 1);
   qxestrncpy (owner->user, lfinfo, len);
   owner->user[len] = 0;

   /* The PID is everything after the last `.'.  */
-  owner->pid = atoi ((CIntbyte *) dot + 1);
+  owner->pid = atoi ((CIbyte *) dot + 1);

   /* The host is everything in between.  */
   len = dot - at - 1;
-  owner->host = (Intbyte *) xmalloc (len + 1);
+  owner->host = (Ibyte *) xmalloc (len + 1);
   qxestrncpy (owner->host, at + 1, len);
   owner->host[len] = 0;

@@ -257,10 +257,10 @@
    Return -1 if cannot lock for any other reason.  */

 static int
-lock_if_free (lock_info_type *clasher, Intbyte *lfname)
+lock_if_free (lock_info_type *clasher, Ibyte *lfname)
 {
   /* Does not GC. */
-  if (lock_file_1 ((Intbyte *) lfname, 0) == 0)
+  if (lock_file_1 ((Ibyte *) lfname, 0) == 0)
     {
       int locker;

@@ -309,7 +309,7 @@
      comment.  -slb */

   register Lisp_Object attack, orig_fn;
-  register Intbyte *lfname, *locker;
+  register Ibyte *lfname, *locker;
   lock_info_type lock_info;
   struct gcpro gcpro1, gcpro2, gcpro3;
   Lisp_Object old_current_buffer;
@@ -346,7 +346,7 @@
     goto done;

   /* Else consider breaking the lock */
-  locker = (Intbyte *) ALLOCA (qxestrlen (lock_info.user)
+  locker = (Ibyte *) ALLOCA (qxestrlen (lock_info.user)
 			       + qxestrlen (lock_info.host)
 			       + LOCK_PID_MAX + 9);
   qxesprintf (locker, "%s@%s (pid %d)", lock_info.user, lock_info.host,
@@ -371,7 +371,7 @@
 unlock_file (Lisp_Object fn)
 {
   /* This can GC */
-  register Intbyte *lfname;
+  register Ibyte *lfname;
   struct gcpro gcpro1;

   GCPRO1 (fn);
@@ -454,7 +454,7 @@
        (filename))
 {
   Lisp_Object ret;
-  register Intbyte *lfname;
+  register Ibyte *lfname;
   int owner;
   lock_info_type locker;
   struct gcpro gcpro1;
--- a/src/fns.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/fns.c	Wed Jun 05 09:58:45 2002 +0000
@@ -387,8 +387,8 @@
     end = len2;

   {
-    Intbyte *ptr1 = XSTRING_DATA (p1);
-    Intbyte *ptr2 = XSTRING_DATA (p2);
+    Ibyte *ptr1 = XSTRING_DATA (p1);
+    Ibyte *ptr2 = XSTRING_DATA (p2);

     /* #### It is not really necessary to do this: We could compare
        byte-by-byte and still get a reasonable comparison, since this
@@ -399,10 +399,10 @@
        aren't really well-defined anyway. */
     for (i = 0; i < end; i++)
       {
-	if (charptr_emchar (ptr1) != charptr_emchar (ptr2))
-	  return charptr_emchar (ptr1) < charptr_emchar (ptr2) ? Qt : Qnil;
-	INC_CHARPTR (ptr1);
-	INC_CHARPTR (ptr2);
+	if (itext_ichar (ptr1) != itext_ichar (ptr2))
+	  return itext_ichar (ptr1) < itext_ichar (ptr2) ? Qt : Qnil;
+	INC_IBYTEPTR (ptr1);
+	INC_IBYTEPTR (ptr2);
       }
   }
   /* Can't do i < len2 because then comparison between "foo" and "foo^@"
@@ -614,8 +614,8 @@
   Lisp_Object last_tail;
   Lisp_Object prev;
   struct merge_string_extents_struct *args_mse = 0;
-  Intbyte *string_result = 0;
-  Intbyte *string_result_ptr = 0;
+  Ibyte *string_result = 0;
+  Ibyte *string_result_ptr = 0;
   struct gcpro gcpro1;
   int sdep = specpdl_depth ();

@@ -725,7 +725,7 @@
 	   O(N^2) yuckage. */
         val = Qnil;
 	string_result =
-	  (Intbyte *) MALLOC_OR_ALLOCA (total_length * MAX_EMCHAR_LEN);
+	  (Ibyte *) MALLOC_OR_ALLOCA (total_length * MAX_ICHAR_LEN);
 	string_result_ptr = string_result;
         break;
       default:
@@ -748,8 +748,8 @@
       Charcount thisleni = 0;
       Charcount thisindex = 0;
       Lisp_Object seq = args[argnum];
-      Intbyte *string_source_ptr = 0;
-      Intbyte *string_prev_result_ptr = string_result_ptr;
+      Ibyte *string_source_ptr = 0;
+      Ibyte *string_prev_result_ptr = string_result_ptr;

       if (!CONSP (seq))
 	{
@@ -783,8 +783,8 @@

 	      if (STRINGP (seq))
 		{
-		  elt = make_char (charptr_emchar (string_source_ptr));
-		  INC_CHARPTR (string_source_ptr);
+		  elt = make_char (itext_ichar (string_source_ptr));
+		  INC_IBYTEPTR (string_source_ptr);
 		}
 	      else if (VECTORP (seq))
                 elt = XVECTOR_DATA (seq)[thisindex];
@@ -814,7 +814,7 @@
 	  else
 	    {
 	      CHECK_CHAR_COERCE_INT (elt);
-	      string_result_ptr += set_charptr_emchar (string_result_ptr,
+	      string_result_ptr += set_itext_ichar (string_result_ptr,
 						       XCHAR (elt));
 	    }
 	}
@@ -1029,26 +1029,26 @@
 /* Split STRING into a list of substrings.  The substrings are the
    parts of original STRING separated by SEPCHAR.  */
 static Lisp_Object
-split_string_by_emchar_1 (const Intbyte *string, Bytecount size,
-			  Emchar sepchar)
+split_string_by_ichar_1 (const Ibyte *string, Bytecount size,
+			  Ichar sepchar)
 {
   Lisp_Object result = Qnil;
-  const Intbyte *end = string + size;
+  const Ibyte *end = string + size;

   while (1)
     {
-      const Intbyte *p = string;
+      const Ibyte *p = string;
       while (p < end)
 	{
-	  if (charptr_emchar (p) == sepchar)
+	  if (itext_ichar (p) == sepchar)
 	    break;
-	  INC_CHARPTR (p);
+	  INC_IBYTEPTR (p);
 	}
       result = Fcons (make_string (string, p - string), result);
       if (p < end)
 	{
 	  string = p;
-	  INC_CHARPTR (string);	/* skip sepchar */
+	  INC_IBYTEPTR (string);	/* skip sepchar */
 	}
       else
 	break;
@@ -1063,7 +1063,7 @@
 split_external_path (const Extbyte *path)
 {
   Bytecount newlen;
-  Intbyte *newpath;
+  Ibyte *newpath;
   if (!path)
     return Qnil;

@@ -1076,20 +1076,20 @@
   if (!newlen)
     return Qnil;

-  return split_string_by_emchar_1 (newpath, newlen, SEPCHAR);
+  return split_string_by_ichar_1 (newpath, newlen, SEPCHAR);
 }

 Lisp_Object
-split_env_path (const CIntbyte *evarname, const Intbyte *default_)
+split_env_path (const CIbyte *evarname, const Ibyte *default_)
 {
-  const Intbyte *path = 0;
+  const Ibyte *path = 0;
   if (evarname)
     path = egetenv (evarname);
   if (!path)
     path = default_;
   if (!path)
     return Qnil;
-  return split_string_by_emchar_1 (path, qxestrlen (path), SEPCHAR);
+  return split_string_by_ichar_1 (path, qxestrlen (path), SEPCHAR);
 }

 /* Ben thinks this function should not exist or be exported to Lisp.
@@ -1102,7 +1102,7 @@
 {
   CHECK_STRING (string);
   CHECK_CHAR (sepchar);
-  return split_string_by_emchar_1 (XSTRING_DATA (string),
+  return split_string_by_ichar_1 (XSTRING_DATA (string),
 				   XSTRING_LENGTH (string),
 				   XCHAR (sepchar));
 }
@@ -1126,9 +1126,9 @@
        "`path-separator' should be set to a single-character string",
        Vpath_separator);

-  return (split_string_by_emchar_1
+  return (split_string_by_ichar_1
 	  (XSTRING_DATA (path), XSTRING_LENGTH (path),
-	   charptr_emchar (XSTRING_DATA (Vpath_separator))));
+	   itext_ichar (XSTRING_DATA (Vpath_separator))));
 }


@@ -2911,15 +2911,15 @@
       Bytecount old_bytecount = XSTRING_LENGTH (array);
       Bytecount new_bytecount;
       Bytecount item_bytecount;
-      Intbyte item_buf[MAX_EMCHAR_LEN];
-      Intbyte *p;
-      Intbyte *end;
+      Ibyte item_buf[MAX_ICHAR_LEN];
+      Ibyte *p;
+      Ibyte *end;

       CHECK_CHAR_COERCE_INT (item);
       CHECK_LISP_WRITEABLE (array);

       sledgehammer_check_ascii_begin (array);
-      item_bytecount = set_charptr_emchar (item_buf, XCHAR (item));
+      item_bytecount = set_itext_ichar (item_buf, XCHAR (item));
       new_bytecount = item_bytecount * (Bytecount) string_char_length (array);

       resize_string (array, -1, new_bytecount - old_bytecount);
@@ -3186,15 +3186,15 @@
     {
       /* The string data of `sequence' might be relocated during GC. */
       Bytecount slen = XSTRING_LENGTH (sequence);
-      Intbyte *p = alloca_array (Intbyte, slen);
-      Intbyte *end = p + slen;
+      Ibyte *p = alloca_array (Ibyte, slen);
+      Ibyte *end = p + slen;

       memcpy (p, XSTRING_DATA (sequence), slen);

       while (p < end)
 	{
-	  args[1] = make_char (charptr_emchar (p));
-	  INC_CHARPTR (p);
+	  args[1] = make_char (itext_ichar (p));
+	  INC_IBYTEPTR (p);
 	  result = Ffuncall (2, args);
 	  if (vals) vals[gcpro1.nvars++] = result;
 	}
@@ -3635,23 +3635,23 @@
 }

 #define ADVANCE_INPUT(c, stream)					\
- ((ec = Lstream_get_emchar (stream)) == -1 ? 0 :			\
+ ((ec = Lstream_get_ichar (stream)) == -1 ? 0 :			\
   ((ec > 255) ?								\
    (base64_conversion_error ("Non-ascii character in base64 input",	\
     make_char (ec)), 0)							\
-   : (c = (Intbyte)ec), 1))
+   : (c = (Ibyte)ec), 1))

 static Bytebpos
-base64_encode_1 (Lstream *istream, Intbyte *to, int line_break)
+base64_encode_1 (Lstream *istream, Ibyte *to, int line_break)
 {
   EMACS_INT counter = 0;
-  Intbyte *e = to;
-  Emchar ec;
+  Ibyte *e = to;
+  Ichar ec;
   unsigned int value;

   while (1)
     {
-      Intbyte c;
+      Ibyte c;
       if (!ADVANCE_INPUT (c, istream))
 	break;

@@ -3701,9 +3701,9 @@

 /* Get next character from the stream, except that non-base64
    characters are ignored.  This is in accordance with rfc2045.  EC
-   should be an Emchar, so that it can hold -1 as the value for EOF.  */
+   should be an Ichar, so that it can hold -1 as the value for EOF.  */
 #define ADVANCE_INPUT_IGNORE_NONBASE64(ec, stream, streampos) do {	\
-  ec = Lstream_get_emchar (stream);					\
+  ec = Lstream_get_ichar (stream);					\
   ++streampos;								\
   /* IS_BASE64 may not be called with negative arguments so check for	\
      EOF first. */							\
@@ -3712,20 +3712,20 @@
 } while (1)

 #define STORE_BYTE(pos, val, ccnt) do {					\
-  pos += set_charptr_emchar (pos, (Emchar)((unsigned char)(val)));	\
+  pos += set_itext_ichar (pos, (Ichar)((unsigned char)(val)));	\
   ++ccnt;								\
 } while (0)

 static Bytebpos
-base64_decode_1 (Lstream *istream, Intbyte *to, Charcount *ccptr)
+base64_decode_1 (Lstream *istream, Ibyte *to, Charcount *ccptr)
 {
   Charcount ccnt = 0;
-  Intbyte *e = to;
+  Ibyte *e = to;
   EMACS_INT streampos = 0;

   while (1)
     {
-      Emchar ec;
+      Ichar ec;
       unsigned long value;

       /* Process first byte of a quadruplet.  */
@@ -3797,7 +3797,7 @@
 */
        (start, end, no_line_break))
 {
-  Intbyte *encoded;
+  Ibyte *encoded;
   Bytebpos encoded_length;
   Charcount allength, length;
   struct buffer *buf = current_buffer;
@@ -3816,9 +3816,9 @@
   allength += allength / MIME_LINE_LENGTH + 1 + 6;

   input = make_lisp_buffer_input_stream (buf, begv, zv, 0);
-  /* We needn't multiply allength with MAX_EMCHAR_LEN because all the
+  /* We needn't multiply allength with MAX_ICHAR_LEN because all the
      base64 characters will be single-byte.  */
-  encoded = (Intbyte *) MALLOC_OR_ALLOCA (allength);
+  encoded = (Ibyte *) MALLOC_OR_ALLOCA (allength);
   encoded_length = base64_encode_1 (XLSTREAM (input), encoded,
 				    NILP (no_line_break));
   if (encoded_length > allength)
@@ -3849,7 +3849,7 @@
 {
   Charcount allength, length;
   Bytebpos encoded_length;
-  Intbyte *encoded;
+  Ibyte *encoded;
   Lisp_Object input, result;
   int speccount = specpdl_depth();

@@ -3860,7 +3860,7 @@
   allength += allength / MIME_LINE_LENGTH + 1 + 6;

   input = make_lisp_string_input_stream (string, 0, -1);
-  encoded = (Intbyte *) MALLOC_OR_ALLOCA (allength);
+  encoded = (Ibyte *) MALLOC_OR_ALLOCA (allength);
   encoded_length = base64_encode_1 (XLSTREAM (input), encoded,
 				    NILP (no_line_break));
   if (encoded_length > allength)
@@ -3881,7 +3881,7 @@
 {
   struct buffer *buf = current_buffer;
   Charbpos begv, zv, old_pt = BUF_PT (buf);
-  Intbyte *decoded;
+  Ibyte *decoded;
   Bytebpos decoded_length;
   Charcount length, cc_decoded_length;
   Lisp_Object input;
@@ -3894,9 +3894,9 @@

   input = make_lisp_buffer_input_stream (buf, begv, zv, 0);
   /* We need to allocate enough room for decoding the text. */
-  decoded = (Intbyte *) MALLOC_OR_ALLOCA (length * MAX_EMCHAR_LEN);
+  decoded = (Ibyte *) MALLOC_OR_ALLOCA (length * MAX_ICHAR_LEN);
   decoded_length = base64_decode_1 (XLSTREAM (input), decoded, &cc_decoded_length);
-  if (decoded_length > length * MAX_EMCHAR_LEN)
+  if (decoded_length > length * MAX_ICHAR_LEN)
     abort ();
   Lstream_delete (XLSTREAM (input));

@@ -3922,7 +3922,7 @@
 */
        (string))
 {
-  Intbyte *decoded;
+  Ibyte *decoded;
   Bytebpos decoded_length;
   Charcount length, cc_decoded_length;
   Lisp_Object input, result;
@@ -3932,12 +3932,12 @@

   length = string_char_length (string);
   /* We need to allocate enough room for decoding the text. */
-  decoded = (Intbyte *) MALLOC_OR_ALLOCA (length * MAX_EMCHAR_LEN);
+  decoded = (Ibyte *) MALLOC_OR_ALLOCA (length * MAX_ICHAR_LEN);

   input = make_lisp_string_input_stream (string, 0, -1);
   decoded_length = base64_decode_1 (XLSTREAM (input), decoded,
 				    &cc_decoded_length);
-  if (decoded_length > length * MAX_EMCHAR_LEN)
+  if (decoded_length > length * MAX_ICHAR_LEN)
     abort ();
   Lstream_delete (XLSTREAM (input));

@@ -4057,7 +4057,7 @@
 */ );
   {
     char c = SEPCHAR;
-    Vpath_separator = make_string ((Intbyte *) &c, 1);
+    Vpath_separator = make_string ((Ibyte *) &c, 1);
   }

   DEFVAR_BOOL ("require-prints-loading-message",
--- a/src/font-lock.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/font-lock.c	Wed Jun 05 09:58:45 2002 +0000
@@ -92,7 +92,7 @@
   enum syntactic_context context;	/* single-char-syntax state */
   enum block_comment_context ccontext;	/* block-comment state */
   enum comment_style style;		/* which comment group */
-  Emchar scontext;			/* active string delimiter */
+  Ichar scontext;			/* active string delimiter */
   int depth;				/* depth in parens */
   int backslash_p;			/* just read a backslash */
   int needs_its_head_reexamined;	/* we're apparently outside of
@@ -428,7 +428,7 @@
 find_context (struct buffer *buf, Charbpos pt)
 {
   /* This function can GC */
-  Emchar prev_c, c;
+  Ichar prev_c, c;
   int prev_syncode, syncode;
   Charbpos target = pt;
   struct syntax_cache *scache;
@@ -563,7 +563,7 @@
 	      {
 		Lisp_Object stringtermobj =
 		  syntax_match (scache->current_syntax_table, c);
-		Emchar stringterm;
+		Ichar stringterm;

 		if (CHARP (stringtermobj))
 		  stringterm = XCHAR (stringtermobj);
--- a/src/frame-gtk.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/frame-gtk.c	Wed Jun 05 09:58:45 2002 +0000
@@ -276,7 +276,7 @@
    individual properties. */

 static void
-gtk_set_frame_text_value (struct frame *f, Intbyte *value,
+gtk_set_frame_text_value (struct frame *f, Ibyte *value,
 			  void (*func) (gpointer, gchar *),
 			  gpointer arg)
 {
@@ -287,7 +287,7 @@

 #ifdef MULE
   {
-    Intbyte *ptr;
+    Ibyte *ptr;

     /* Optimize for common ASCII case */
     for (ptr = value; *ptr; ptr++)
@@ -305,7 +305,7 @@
 }

 static void
-gtk_set_title_from_intbyte (struct frame *f, Intbyte *name)
+gtk_set_title_from_ibyte (struct frame *f, Ibyte *name)
 {
   if (GTK_IS_WINDOW (FRAME_GTK_SHELL_WIDGET (f)))
     gtk_set_frame_text_value (f, name,
@@ -314,7 +314,7 @@
 }

 static void
-gtk_set_icon_name_from_intbyte (struct frame *f, Intbyte *name)
+gtk_set_icon_name_from_ibyte (struct frame *f, Ibyte *name)
 {
   gtk_set_frame_text_value (f, name,
 			    (void (*)(gpointer, gchar *))
@@ -1430,8 +1430,8 @@
   CONSOLE_HAS_METHOD (gtk, internal_frame_property_p);
   CONSOLE_HAS_METHOD (gtk, frame_properties);
   CONSOLE_HAS_METHOD (gtk, set_frame_properties);
-  CONSOLE_HAS_METHOD (gtk, set_title_from_intbyte);
-  CONSOLE_HAS_METHOD (gtk, set_icon_name_from_intbyte);
+  CONSOLE_HAS_METHOD (gtk, set_title_from_ibyte);
+  CONSOLE_HAS_METHOD (gtk, set_icon_name_from_ibyte);
   CONSOLE_HAS_METHOD (gtk, frame_visible_p);
   CONSOLE_HAS_METHOD (gtk, frame_totally_visible_p);
   CONSOLE_HAS_METHOD (gtk, frame_iconified_p);
--- a/src/frame-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/frame-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -524,7 +524,7 @@
 }

 static void
-mswindows_set_title_from_intbyte (struct frame *f, Intbyte *title)
+mswindows_set_title_from_ibyte (struct frame *f, Ibyte *title)
 {
   unsigned int new_checksum = hash_string (title, qxestrlen (title));
   if (new_checksum != FRAME_MSWINDOWS_TITLE_CHECKSUM (f))
@@ -1101,8 +1101,8 @@
   CONSOLE_HAS_METHOD (mswindows, internal_frame_property_p);
   CONSOLE_HAS_METHOD (mswindows, frame_properties);
   CONSOLE_HAS_METHOD (mswindows, set_frame_properties);
-  CONSOLE_HAS_METHOD (mswindows, set_title_from_intbyte);
-/*  CONSOLE_HAS_METHOD (mswindows, set_icon_name_from_intbyte); */
+  CONSOLE_HAS_METHOD (mswindows, set_title_from_ibyte);
+/*  CONSOLE_HAS_METHOD (mswindows, set_icon_name_from_ibyte); */
   CONSOLE_HAS_METHOD (mswindows, frame_visible_p);
   CONSOLE_HAS_METHOD (mswindows, frame_totally_visible_p);
   CONSOLE_HAS_METHOD (mswindows, frame_iconified_p);
--- a/src/frame-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/frame-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -494,7 +494,7 @@
 static Lisp_Object
 color_to_string (Widget w, unsigned long pixel)
 {
-  Intbyte buf[255];
+  Ibyte buf[255];

   XColor color;
   color.pixel = pixel;
@@ -653,7 +653,7 @@
    individual properties. */

 static void
-x_set_frame_text_value (struct frame *f, Intbyte *value,
+x_set_frame_text_value (struct frame *f, Ibyte *value,
 			String Xt_resource_name,
 			String Xt_resource_encoding_name)
 {
@@ -662,7 +662,7 @@
   String old_XtValue = NULL;

 #ifdef MULE
-  Intbyte *ptr;
+  Ibyte *ptr;
   /* Optimize for common ASCII case */
   for (ptr = value; *ptr; ptr++)
     if (!byte_ascii_p (*ptr))
@@ -687,13 +687,13 @@
 }

 static void
-x_set_title_from_intbyte (struct frame *f, Intbyte *name)
+x_set_title_from_ibyte (struct frame *f, Ibyte *name)
 {
   x_set_frame_text_value (f, name, XtNtitle, XtNtitleEncoding);
 }

 static void
-x_set_icon_name_from_intbyte (struct frame *f, Intbyte *name)
+x_set_icon_name_from_ibyte (struct frame *f, Ibyte *name)
 {
   x_set_frame_text_value (f, name, XtNiconName, XtNiconNameEncoding);
 }
@@ -1266,7 +1266,7 @@
 	  filePath = transferInfo->dropData->data.files[ii];
 	  hurl = dnd_url_hexify_string ((char *)filePath, "file:");
           /* #### Mule-izing required */
-	  l_data = Fcons (make_string ((Intbyte* )hurl,
+	  l_data = Fcons (make_string ((Ibyte* )hurl,
 				       strlen (hurl)),
 			  l_data);
 	  xfree (hurl);
@@ -1288,11 +1288,11 @@
 	  /* let us forget this name thing for now... */
  	  /* filePath = transferInfo->dropData->data.buffers[ii].name;
 	     path = (filePath == NULL) ? Qnil
-	     : make_string ((Intbyte *)filePath, strlen (filePath)); */
+	     : make_string ((Ibyte *)filePath, strlen (filePath)); */
 	  /* what, if the data is no text, and how can I tell it? */
-	  l_data = Fcons ( list3 ( list1 ( make_string ((Intbyte *)"text/plain", 10) ),
-				   make_string ((Intbyte *)"8bit", 4),
-				   make_string ((Intbyte *)transferInfo->dropData->data.buffers[ii].bp,
+	  l_data = Fcons ( list3 ( list1 ( make_string ((Ibyte *)"text/plain", 10) ),
+				   make_string ((Ibyte *)"8bit", 4),
+				   make_string ((Ibyte *)transferInfo->dropData->data.buffers[ii].bp,
 						transferInfo->dropData->data.buffers[ii].size) ),
 			   l_data );
  	}
@@ -2289,7 +2289,7 @@
 */
        (frame))
 {
-  Intbyte str[255];
+  Ibyte str[255];
   struct frame *f = decode_x_frame (frame);

   qxesprintf (str, "%lu", XtWindow (FRAME_X_TEXT_WIDGET (f)));
@@ -2821,8 +2821,8 @@
   CONSOLE_HAS_METHOD (x, internal_frame_property_p);
   CONSOLE_HAS_METHOD (x, frame_properties);
   CONSOLE_HAS_METHOD (x, set_frame_properties);
-  CONSOLE_HAS_METHOD (x, set_title_from_intbyte);
-  CONSOLE_HAS_METHOD (x, set_icon_name_from_intbyte);
+  CONSOLE_HAS_METHOD (x, set_title_from_ibyte);
+  CONSOLE_HAS_METHOD (x, set_icon_name_from_ibyte);
   CONSOLE_HAS_METHOD (x, frame_visible_p);
   CONSOLE_HAS_METHOD (x, frame_totally_visible_p);
   CONSOLE_HAS_METHOD (x, frame_iconified_p);
--- a/src/frame.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/frame.c	Wed Jun 05 09:58:45 2002 +0000
@@ -125,7 +125,7 @@
 static struct display_line title_string_display_line;
 /* Used by generate_title_string. Global because they get used so much that
    the dynamic allocation time adds up. */
-static Emchar_dynarr *title_string_emchar_dynarr;
+static Ichar_dynarr *title_string_ichar_dynarr;


 static Lisp_Object
@@ -234,7 +234,7 @@
     buf = Fcurrent_buffer ();
     /* If buf is a 'hidden' buffer (i.e. one whose name starts with
        a space), try to find another one.  */
-    if (string_emchar (Fbuffer_name (buf), 0) == ' ')
+    if (string_ichar (Fbuffer_name (buf), 0) == ' ')
       buf = Fother_buffer (buf, Qnil, Qnil);
     Fset_window_buffer (root_window, buf, Qnil);
   }
@@ -411,7 +411,7 @@
   else
     name = build_string ("emacs");

-  if (!NILP (Fstring_match (make_string ((const Intbyte *) "\\.", 2), name,
+  if (!NILP (Fstring_match (make_string ((const Ibyte *) "\\.", 2), name,
 			    Qnil, Qnil)))
     syntax_error (". not allowed in frame names", name);

@@ -3217,7 +3217,7 @@


 /* The caller is responsible for freeing the returned string. */
-static Intbyte *
+static Ibyte *
 generate_title_string (struct window *w, Lisp_Object format_str,
 		       face_index findex, int type)
 {
@@ -3232,19 +3232,19 @@
   generate_formatted_string_db (format_str, Qnil, w, dl, db, findex, 0,
                                 -1, type);

-  Dynarr_reset (title_string_emchar_dynarr);
+  Dynarr_reset (title_string_ichar_dynarr);
   while (elt < Dynarr_length (db->runes))
     {
       if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
-	Dynarr_add (title_string_emchar_dynarr,
+	Dynarr_add (title_string_ichar_dynarr,
 		    Dynarr_atp (db->runes, elt)->object.chr.ch);
       elt++;
     }

   return
-    convert_emchar_string_into_malloced_string
-    (Dynarr_atp (title_string_emchar_dynarr, 0),
-     Dynarr_length (title_string_emchar_dynarr), 0);
+    convert_ichar_string_into_malloced_string
+    (Dynarr_atp (title_string_ichar_dynarr, 0),
+     Dynarr_length (title_string_ichar_dynarr), 0);
 }

 void
@@ -3253,7 +3253,7 @@
   struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
   Lisp_Object title_format;
   Lisp_Object icon_format;
-  Intbyte *title;
+  Ibyte *title;

   /* We don't change the title for the minibuffer unless the frame
      only has a minibuffer. */
@@ -3268,14 +3268,14 @@
   title_format = symbol_value_in_buffer (Qframe_title_format,      w->buffer);
   icon_format  = symbol_value_in_buffer (Qframe_icon_title_format, w->buffer);

-  if (HAS_FRAMEMETH_P (f, set_title_from_intbyte))
+  if (HAS_FRAMEMETH_P (f, set_title_from_ibyte))
     {
       title = generate_title_string (w, title_format,
 				     DEFAULT_INDEX, CURRENT_DISP);
-      FRAMEMETH (f, set_title_from_intbyte, (f, title));
+      FRAMEMETH (f, set_title_from_ibyte, (f, title));
     }

-  if (HAS_FRAMEMETH_P (f, set_icon_name_from_intbyte))
+  if (HAS_FRAMEMETH_P (f, set_icon_name_from_ibyte))
     {
       if (!EQ (icon_format, title_format) || !title)
 	{
@@ -3285,7 +3285,7 @@
 	  title = generate_title_string (w, icon_format,
 					 DEFAULT_INDEX, CURRENT_DISP);
 	}
-      FRAMEMETH (f, set_icon_name_from_intbyte, (f, title));
+      FRAMEMETH (f, set_icon_name_from_ibyte, (f, title));
     }

   if (title)
@@ -3355,7 +3355,7 @@
   if (!initialized)
 #endif
     {
-      title_string_emchar_dynarr = Dynarr_new (Emchar);
+      title_string_ichar_dynarr = Dynarr_new (Ichar);
       xzero (title_string_display_line);
     }
 }
--- a/src/glyphs-eimage.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/glyphs-eimage.c	Wed Jun 05 09:58:45 2002 +0000
@@ -302,7 +302,7 @@
 my_jpeg_output_message (j_common_ptr cinfo)
 {
   Extbyte buffer[JMSG_LENGTH_MAX];
-  Intbyte *intbuf;
+  Ibyte *intbuf;

   /* Create the message */
   (*cinfo->err->format_message) (cinfo, buffer);
@@ -635,7 +635,7 @@
       {
 	/* An error was signaled. No clean up is needed, as unwind handles that
 	   for us.  Just pass the error along. */
-	Intbyte *interr;
+	Ibyte *interr;
 	Lisp_Object errstring;
 	EXTERNAL_TO_C_STRING (gif_err.err_str, interr, Qnative);
 	errstring = build_msg_intstring (interr);
--- a/src/glyphs-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/glyphs-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -720,7 +720,7 @@

 struct color_symbol
 {
-  Intbyte *	name;
+  Ibyte *	name;
   COLORREF	color;
 };

@@ -899,7 +899,7 @@
       if (xpmimage.colorTable[i].c_color)
 	{
 	  colortbl[i]=
-	    mswindows_string_to_color ((Intbyte *)
+	    mswindows_string_to_color ((Ibyte *)
 				       xpmimage.colorTable[i].c_color);
 	  goto label_found_color;
 	}
@@ -1094,7 +1094,7 @@

 typedef struct
 {
-  CIntbyte *name;
+  CIbyte *name;
   int	resource_id;
 } resource_t;

@@ -1175,7 +1175,7 @@

   do
     {
-      if (!qxestrcasecmp_i18n ((Intbyte *) res->name, XSTRING_DATA (name)))
+      if (!qxestrcasecmp_i18n ((Ibyte *) res->name, XSTRING_DATA (name)))
 	return res->resource_id;
     }
   while ((++res)->name);
@@ -1637,7 +1637,7 @@
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
   int i, stattis;
   UChar_Binary *p, *bits, *bp;
-  const CIntbyte * volatile emsg = 0;
+  const CIbyte * volatile emsg = 0;
   const UChar_Binary * volatile dstring;

   assert (!NILP (data));
@@ -1803,16 +1803,16 @@
 charset_of_text (Lisp_Object text)
 {
 #ifdef MULE
-  Intbyte *p;
+  Ibyte *p;

   if (NILP (text))
     return Vcharset_ascii;
   for (p = XSTRING_DATA (text); *p;)
     {
-      Emchar c = charptr_emchar (p);
-      if (!EQ (emchar_charset (c), Vcharset_ascii))
-	return emchar_charset (c);
-      INC_CHARPTR (p);
+      Ichar c = itext_ichar (p);
+      if (!EQ (ichar_charset (c), Vcharset_ascii))
+	return ichar_charset (c);
+      INC_IBYTEPTR (p);
     }
 #endif /* MULE */

@@ -2213,7 +2213,7 @@
 			      Lisp_Object instantiator,
 			      Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 			      int dest_mask, Lisp_Object domain,
-			      const CIntbyte *class, int flags, int exflags)
+			      const CIbyte *class, int flags, int exflags)
 {
   /* this function can call lisp */
   Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
--- a/src/glyphs-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/glyphs-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -583,7 +583,7 @@

 #ifdef USE_XBMLANGPATH
   {
-    Intbyte *path = egetenv ("XBMLANGPATH");
+    Ibyte *path = egetenv ("XBMLANGPATH");
     Extbyte *pathext;
     SubstitutionRec subs[1];
     subs[0].match = 'B';
@@ -610,7 +610,7 @@
 			  "bitmapFilePath", "BitmapFilePath", &type, &value)
 	  && !strcmp (type, "String"))
 	{
-	  Intbyte *path;
+	  Ibyte *path;

 	  EXTERNAL_TO_C_STRING (value.addr, path, Qfile_name);
 	  Vx_bitmap_file_path = split_env_path (0, path);
@@ -1562,7 +1562,7 @@
   Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
   int i, stattis;
   UChar_Binary *p, *bits, *bp;
-  const CIntbyte * volatile emsg = 0;
+  const CIbyte * volatile emsg = 0;
   const UChar_Binary * volatile dstring;

   assert (!NILP (data));
@@ -1802,7 +1802,7 @@
 }

 static Font
-safe_XLoadFont (Display *dpy, Intbyte *name)
+safe_XLoadFont (Display *dpy, Ibyte *name)
 {
   Font font;
   int (*old_handler) (Display *, XErrorEvent *);
@@ -1837,7 +1837,7 @@
   Display *dpy;
   XColor fg, bg;
   Font source, mask;
-  Intbyte source_name[PATH_MAX], mask_name[PATH_MAX], dummy;
+  Ibyte source_name[PATH_MAX], mask_name[PATH_MAX], dummy;
   int source_char, mask_char;
   int count;
   Lisp_Object foreground, background;
--- a/src/glyphs.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/glyphs.c	Wed Jun 05 09:58:45 2002 +0000
@@ -928,7 +928,7 @@
     case IMAGE_POINTER:
       if (STRINGP (IMAGE_INSTANCE_PIXMAP_FILENAME (ii)))
 	{
-	  Intbyte *s;
+	  Ibyte *s;
 	  Lisp_Object filename = IMAGE_INSTANCE_PIXMAP_FILENAME (ii);
 	  s = qxestrrchr (XSTRING_DATA (filename), '/');
 	  if (s)
@@ -2127,19 +2127,19 @@
 /*                              error helpers                           */
 /************************************************************************/
 DOESNT_RETURN
-signal_image_error (const CIntbyte *reason, Lisp_Object frob)
+signal_image_error (const CIbyte *reason, Lisp_Object frob)
 {
   signal_error (Qimage_conversion_error, reason, frob);
 }

 DOESNT_RETURN
-signal_image_error_2 (const CIntbyte *reason, Lisp_Object frob0, Lisp_Object frob1)
+signal_image_error_2 (const CIbyte *reason, Lisp_Object frob0, Lisp_Object frob1)
 {
   signal_error_2 (Qimage_conversion_error, reason, frob0, frob1);
 }

 DOESNT_RETURN
-signal_double_image_error (const CIntbyte *string1, const CIntbyte *string2,
+signal_double_image_error (const CIbyte *string1, const CIbyte *string2,
 			   Lisp_Object data)
 {
   signal_error_1 (Qimage_conversion_error,
@@ -2149,7 +2149,7 @@
 }

 DOESNT_RETURN
-signal_double_image_error_2 (const CIntbyte *string1, const CIntbyte *string2,
+signal_double_image_error_2 (const CIbyte *string1, const CIbyte *string2,
 			     Lisp_Object data1, Lisp_Object data2)
 {
   signal_error_1 (Qimage_conversion_error,
@@ -2280,7 +2280,7 @@
   if (height)
     {
       /* Compute string metric info */
-      find_charsets_in_intbyte_string (charsets,
+      find_charsets_in_ibyte_string (charsets,
 				       XSTRING_DATA   (string),
 				       XSTRING_LENGTH (string));

@@ -2330,7 +2330,7 @@
   Lisp_Object frame = DOMAIN_FRAME (domain);

   /* Compute string font info */
-  find_charsets_in_intbyte_string (charsets,
+  find_charsets_in_ibyte_string (charsets,
 				   XSTRING_DATA   (string),
 				   XSTRING_LENGTH (string));

@@ -4849,7 +4849,7 @@
 }

 Lisp_Object
-display_table_entry (Emchar ch, Lisp_Object face_table,
+display_table_entry (Ichar ch, Lisp_Object face_table,
 		     Lisp_Object window_table)
 {
   Lisp_Object tail;
--- a/src/glyphs.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/glyphs.h	Wed Jun 05 09:58:45 2002 +0000
@@ -1149,7 +1149,7 @@
 /*				Display Tables				*/
 /************************************************************************/

-Lisp_Object display_table_entry (Emchar, Lisp_Object, Lisp_Object);
+Lisp_Object display_table_entry (Ichar, Lisp_Object, Lisp_Object);
 void get_display_tables (struct window *, face_index,
 			 Lisp_Object *, Lisp_Object *);
--- a/src/gpmevent.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/gpmevent.c	Wed Jun 05 09:58:45 2002 +0000
@@ -261,7 +261,7 @@

   while (1)
     {
-      Intbyte tempbuf[1024];	/* some random amount */
+      Ibyte tempbuf[1024];	/* some random amount */
       Bytecount i;
       Bytecount size_in_bytes =
 	Lstream_read (XLSTREAM (terminal_stream),
--- a/src/gui-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/gui-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -319,10 +319,10 @@
 #endif

 Extbyte *
-menu_separator_style_and_to_external (const Intbyte *s)
+menu_separator_style_and_to_external (const Ibyte *s)
 {
-  const Intbyte *p;
-  Intbyte first;
+  const Ibyte *p;
+  Ibyte first;

   if (!s || s[0] == '\0')
     return NULL;
@@ -358,7 +358,7 @@
   int i;
   int found_accel = 0;
   Extbyte *retval;
-  Intbyte *name = XSTRING_DATA (string);
+  Ibyte *name = XSTRING_DATA (string);

   for (i = 0; name[i]; ++i)
     if (name[i] == '%' && name[i+1] == '_')
@@ -372,7 +372,7 @@
   else
     {
       Bytecount namelen = XSTRING_LENGTH (string);
-      Intbyte *chars = (Intbyte *) ALLOCA (namelen + 3);
+      Ibyte *chars = (Ibyte *) ALLOCA (namelen + 3);
       chars[0] = '%';
       chars[1] = '_';
       memcpy (chars + 2, name, namelen + 1);
@@ -488,7 +488,7 @@
   CHECK_SYMBOL (pgui->style);
   if (NILP (pgui->style))
     {
-      Intbyte *intname;
+      Ibyte *intname;
       Bytecount intlen;
       /* If the callback is nil, treat this item like unselectable text.
 	 This way, dashes will show up as a separator. */
--- a/src/gui-x.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/gui-x.h	Wed Jun 05 09:58:45 2002 +0000
@@ -77,7 +77,7 @@
 				 int menu_entry_p, int accel_p);
 widget_value * gui_items_to_widget_values (Lisp_Object gui_object_instance,
 					   Lisp_Object items, int accel_p);
-Extbyte *menu_separator_style_and_to_external (const Intbyte *s);
+Extbyte *menu_separator_style_and_to_external (const Ibyte *s);
 Lisp_Object widget_value_unwind (Lisp_Object closure);

 #endif /* INCLUDED_gui_x_h_ */
--- a/src/gui.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/gui.c	Wed Jun 05 09:58:45 2002 +0000
@@ -56,10 +56,10 @@
 #endif /* HAVE_POPUPS */

 int
-separator_string_p (const Intbyte *s)
+separator_string_p (const Ibyte *s)
 {
-  const Intbyte *p;
-  Intbyte first;
+  const Ibyte *p;
+  Ibyte first;

   if (!s || s[0] == '\0')
     return 0;
@@ -410,7 +410,7 @@
 Lisp_Object
 gui_name_accelerator (Lisp_Object nm)
 {
-  Intbyte *name = XSTRING_DATA (nm);
+  Ibyte *name = XSTRING_DATA (nm);

   while (*name)
     {
@@ -421,13 +421,13 @@
 	    return Qnil;
 	  if (*name == '_' && *(name + 1))
 	    {
-	      Emchar accelerator = charptr_emchar (name + 1);
+	      Ichar accelerator = itext_ichar (name + 1);
 	      return make_char (DOWNCASE (0, accelerator));
 	    }
 	}
-	INC_CHARPTR (name);
+	INC_IBYTEPTR (name);
     }
-  return make_char (DOWNCASE (0, charptr_emchar (XSTRING_DATA (nm))));
+  return make_char (DOWNCASE (0, itext_ichar (XSTRING_DATA (nm))));
 }

 /*
--- a/src/gui.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/gui.h	Wed Jun 05 09:58:45 2002 +0000
@@ -27,7 +27,7 @@
 #ifndef INCLUDED_gui_h_
 #define INCLUDED_gui_h_

-int separator_string_p (const Intbyte *s);
+int separator_string_p (const Ibyte *s);
 void get_gui_callback (Lisp_Object, Lisp_Object *, Lisp_Object *);
 int gui_item_equal_sans_selected (Lisp_Object obj1, Lisp_Object obj2, int depth);
--- a/src/hpplay.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/hpplay.c	Wed Jun 05 09:58:45 2002 +0000
@@ -75,7 +75,7 @@
 player_error_internal (Audio * audio, Char_ASCII * text, long errorCode)
 {
   Extbyte errorbuff[132];
-  Intbyte *interr;
+  Ibyte *interr;

   AGetErrorText (audio, errorCode, errorbuff, 131);
   EXTERNAL_TO_C_STRING (errorbuf, interr, Qnative);
--- a/src/indent.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/indent.c	Wed Jun 05 09:58:45 2002 +0000
@@ -132,7 +132,7 @@
   int tab_width = XINT (buf->tab_width);
   int post_tab;
   Charbpos pos = init_pos;
-  Emchar c;
+  Ichar c;

   if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
   col = tab_seen = post_tab = 0;
@@ -170,7 +170,7 @@
 		     + displayed_glyphs->end_columns));
 #else /* XEmacs */
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (emchar_charset (c));
+	  col += XCHARSET_COLUMNS (ichar_charset (c));
 #else
 	  col ++;
 #endif /* MULE */
@@ -202,7 +202,7 @@
   int tab_seen;
   int post_tab;
   Charbpos pos = init_pos;
-  Emchar c;
+  Ichar c;

   if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
   col = tab_seen = post_tab = 0;
@@ -213,7 +213,7 @@
 	break;

       pos--;
-      c = string_emchar (s, pos);
+      c = string_ichar (s, pos);
       if (c == '\t')
 	{
 	  if (tab_seen)
@@ -227,7 +227,7 @@
 	break;
       else
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (emchar_charset (c));
+	  col += XCHARSET_COLUMNS (ichar_charset (c));
 #else
 	  col ++;
 #endif /* MULE */
@@ -345,7 +345,7 @@
 {
   Bytebpos byte_end = BYTE_BUF_ZV (b);
   int col = 0;
-  Emchar c;
+  Ichar c;
   int tab_width = XINT (b->tab_width);

   if (tab_width <= 0 || tab_width > 1000)
@@ -410,7 +410,7 @@
   int tab_width = XINT (buf->tab_width);

   int prev_col = 0;
-  Emchar c = 0;
+  Ichar c = 0;

   buffer = wrap_buffer (buf);
   if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
@@ -457,7 +457,7 @@
 		     + displayed_glyphs->end_columns));
 #else /* XEmacs */
 #ifdef MULE
-	  col += XCHARSET_COLUMNS (emchar_charset (c));
+	  col += XCHARSET_COLUMNS (ichar_charset (c));
 #else
 	  col ++;
 #endif /* MULE */
--- a/src/insdel.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/insdel.c	Wed Jun 05 09:58:45 2002 +0000
@@ -259,7 +259,7 @@
 static void
 gap_left (struct buffer *buf, Bytebpos pos)
 {
-  Intbyte *to, *from;
+  Ibyte *to, *from;
   Bytecount i;
   Bytebpos new_s1;
   struct buffer *mbuf;
@@ -330,7 +330,7 @@
 static void
 gap_right (struct buffer *buf, Bytebpos pos)
 {
-  Intbyte *to, *from;
+  Ibyte *to, *from;
   Bytecount i;
   Bytebpos new_s1;
   struct buffer *mbuf;
@@ -469,7 +469,7 @@
 static void
 make_gap (struct buffer *buf, Bytecount increment)
 {
-  Intbyte *result;
+  Ibyte *result;
   Lisp_Object tem;
   Bytebpos real_gap_loc;
   Bytecount old_gap_size;
@@ -1005,7 +1005,7 @@
 /************************************************************************/

 void
-fixup_internal_substring (const Intbyte *nonreloc, Lisp_Object reloc,
+fixup_internal_substring (const Ibyte *nonreloc, Lisp_Object reloc,
 			  Bytecount offset, Bytecount *len)
 {
   assert ((nonreloc && NILP (reloc)) || (!nonreloc && STRINGP (reloc)));
@@ -1047,7 +1047,7 @@

 Charcount
 buffer_insert_string_1 (struct buffer *buf, Charbpos pos,
-			const Intbyte *nonreloc, Lisp_Object reloc,
+			const Ibyte *nonreloc, Lisp_Object reloc,
 			Bytecount offset, Bytecount length,
 			int flags)
 {
@@ -1181,19 +1181,19 @@
   /* Update our count of ASCII, 8-bit and 16-bit chars and the
      entirely-one-byte flag */
   {
-    const Intbyte *ptr = nonreloc + offset;
-    const Intbyte *ptrend = ptr + length;
+    const Ibyte *ptr = nonreloc + offset;
+    const Ibyte *ptrend = ptr + length;

     while (ptr < ptrend)
       {
-	Emchar ch = charptr_emchar (ptr);
-	if (emchar_ascii_p (ch))
+	Ichar ch = itext_ichar (ptr);
+	if (ichar_ascii_p (ch))
 	  buf->text->num_ascii_chars++;
-	if (emchar_8_bit_fixed_p (ch, wrap_buffer (buf)))
+	if (ichar_8_bit_fixed_p (ch, wrap_buffer (buf)))
 	  buf->text->num_8_bit_fixed_chars++;
-	if (emchar_16_bit_fixed_p (ch, wrap_buffer (buf)))
+	if (ichar_16_bit_fixed_p (ch, wrap_buffer (buf)))
 	  buf->text->num_16_bit_fixed_chars++;
-	INC_CHARPTR (ptr);
+	INC_IBYTEPTR (ptr);
       }

     buf->text->entirely_one_byte_p =
@@ -1268,7 +1268,7 @@

 Charcount
 buffer_insert_raw_string_1 (struct buffer *buf, Charbpos pos,
-			    const Intbyte *nonreloc, Bytecount length,
+			    const Ibyte *nonreloc, Bytecount length,
 			    int flags)
 {
   /* This function can GC */
@@ -1294,17 +1294,17 @@
 {
   /* This function can GC */
   const char *translated = GETTEXT (s);
-  return buffer_insert_string_1 (buf, pos, (const Intbyte *) translated, Qnil,
+  return buffer_insert_string_1 (buf, pos, (const Ibyte *) translated, Qnil,
 				 0, strlen (translated), flags);
 }

 Charcount
-buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, Emchar ch,
+buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, Ichar ch,
 			    int flags)
 {
   /* This function can GC */
-  Intbyte str[MAX_EMCHAR_LEN];
-  Bytecount len = set_charptr_emchar (str, ch);
+  Ibyte str[MAX_ICHAR_LEN];
+  Bytecount len = set_itext_ichar (str, ch);
   return buffer_insert_string_1 (buf, pos, str, Qnil, 0, len, flags);
 }

@@ -1313,7 +1313,7 @@
 			int flags)
 {
   /* This function can GC */
-  return buffer_insert_emacs_char_1 (buf, pos, (Emchar) (unsigned char) c,
+  return buffer_insert_emacs_char_1 (buf, pos, (Ichar) (unsigned char) c,
 				     flags);
 }

@@ -1437,12 +1437,12 @@

     for (i = byte_from; i < byte_to; i = next_bytebpos (buf, i))
       {
-	Emchar ch = BYTE_BUF_FETCH_CHAR (buf, i);
-	if (emchar_ascii_p (ch))
+	Ichar ch = BYTE_BUF_FETCH_CHAR (buf, i);
+	if (ichar_ascii_p (ch))
 	  buf->text->num_ascii_chars--;
-	if (emchar_8_bit_fixed_p (ch, wrap_buffer (buf)))
+	if (ichar_8_bit_fixed_p (ch, wrap_buffer (buf)))
 	  buf->text->num_8_bit_fixed_chars--;
-	if (emchar_16_bit_fixed_p (ch, wrap_buffer (buf)))
+	if (ichar_16_bit_fixed_p (ch, wrap_buffer (buf)))
 	  buf->text->num_16_bit_fixed_chars--;
       }
   }
@@ -1548,24 +1548,24 @@
 /* Replace the character at POS in buffer B with CH. */

 void
-buffer_replace_char (struct buffer *buf, Charbpos pos, Emchar ch,
+buffer_replace_char (struct buffer *buf, Charbpos pos, Ichar ch,
 		     int not_real_change, int force_lock_check)
 {
   /* This function can GC */
-  Intbyte newstr[MAX_EMCHAR_LEN];
+  Ibyte newstr[MAX_ICHAR_LEN];
   Bytecount newlen;
-  Emchar oldch;
+  Ichar oldch;

   /* Defensive steps just in case a buffer gets deleted and a calling
      function doesn't notice it. */
   if (!BUFFER_LIVE_P (buf))
     return;

-  newlen = set_charptr_emchar_fmt (newstr, ch, BUF_FORMAT (buf),
+  newlen = set_itext_ichar_fmt (newstr, ch, BUF_FORMAT (buf),
 				   wrap_buffer (buf));
   oldch = BUF_FETCH_CHAR (buf, pos);
-  if (emchar_fits_in_format (ch, BUF_FORMAT (buf), wrap_buffer (buf)) &&
-      newlen == emchar_len_fmt (oldch, BUF_FORMAT (buf)))
+  if (ichar_fits_in_format (ch, BUF_FORMAT (buf), wrap_buffer (buf)) &&
+      newlen == ichar_len_fmt (oldch, BUF_FORMAT (buf)))
     {
       struct buffer *mbuf;
       Lisp_Object bufcons;
@@ -1606,17 +1606,17 @@
 	}

 #ifdef MULE
-      if (emchar_ascii_p (oldch))
+      if (ichar_ascii_p (oldch))
 	buf->text->num_ascii_chars--;
-      if (emchar_8_bit_fixed_p (oldch, wrap_buffer (buf)))
+      if (ichar_8_bit_fixed_p (oldch, wrap_buffer (buf)))
 	buf->text->num_8_bit_fixed_chars--;
-      if (emchar_16_bit_fixed_p (oldch, wrap_buffer (buf)))
+      if (ichar_16_bit_fixed_p (oldch, wrap_buffer (buf)))
 	buf->text->num_16_bit_fixed_chars--;
-      if (emchar_ascii_p (ch))
+      if (ichar_ascii_p (ch))
 	buf->text->num_ascii_chars++;
-      if (emchar_8_bit_fixed_p (ch, wrap_buffer (buf)))
+      if (ichar_8_bit_fixed_p (ch, wrap_buffer (buf)))
 	buf->text->num_8_bit_fixed_chars++;
-      if (emchar_16_bit_fixed_p (ch, wrap_buffer (buf)))
+      if (ichar_16_bit_fixed_p (ch, wrap_buffer (buf)))
 	buf->text->num_16_bit_fixed_chars++;
 #endif /* MULE */
--- a/src/insdel.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/insdel.h	Wed Jun 05 09:58:45 2002 +0000
@@ -38,18 +38,18 @@
 #define INSDEL_NO_LOCKING 2

 Charcount buffer_insert_string_1 (struct buffer *buf, Charbpos pos,
-				  const Intbyte *nonreloc, Lisp_Object reloc,
+				  const Ibyte *nonreloc, Lisp_Object reloc,
 				  Bytecount offset, Bytecount length,
 				  int flags);
 Charcount buffer_insert_raw_string_1 (struct buffer *buf, Charbpos pos,
-				      const Intbyte *nonreloc,
+				      const Ibyte *nonreloc,
 				      Bytecount length, int flags);
 Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Charbpos pos,
 				       Lisp_Object str, int flags);
 Charcount buffer_insert_c_string_1 (struct buffer *buf, Charbpos pos,
 				    const char *s, int flags);
 Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos,
-				      Emchar ch, int flags);
+				      Ichar ch, int flags);
 Charcount buffer_insert_c_char_1 (struct buffer *buf, Charbpos pos, char c,
 				  int flags);
 Charcount buffer_insert_from_buffer_1 (struct buffer *buf, Charbpos pos,
@@ -76,7 +76,7 @@

 void buffer_delete_range (struct buffer *buf, Charbpos from, Charbpos to,
 			  int flags);
-void buffer_replace_char (struct buffer *b, Charbpos pos, Emchar ch,
+void buffer_replace_char (struct buffer *b, Charbpos pos, Ichar ch,
 			  int not_real_change, int force_lock_check);


@@ -142,7 +142,7 @@
 Membpos do_marker_adjustment (Membpos mpos, Membpos from,
 			     Membpos to, Bytecount amount);

-void fixup_internal_substring (const Intbyte *nonreloc,
+void fixup_internal_substring (const Ibyte *nonreloc,
 			       Lisp_Object reloc,
 			       Bytecount offset, Bytecount *len);
--- a/src/intl-win32.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/intl-win32.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1867,13 +1867,13 @@
    See above for why this exists, and the TO_INTERNAL_FORMAT() macros
    aren't just used. */

-Intbyte *
+Ibyte *
 convert_multibyte_to_internal_malloc (const Extbyte *src, Bytecount n,
 				      int cp, Bytecount *size_out)
 {
   Bytecount size;
   Extbyte *unidata = convert_multibyte_to_unicode_malloc (src, n, cp, &size);
-  Intbyte *intdata;
+  Ibyte *intdata;

   TO_INTERNAL_FORMAT (DATA, (unidata, size), MALLOC, (intdata, size),
 		      Qmswindows_unicode);
--- a/src/keymap.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/keymap.c	Wed Jun 05 09:58:45 2002 +0000
@@ -440,8 +440,8 @@
 	 "9" as its name.
        */
       /* !!#### I'm not sure how correct this is. */
-      Intbyte str [1 + MAX_EMCHAR_LEN];
-      Bytecount count = set_charptr_emchar (str, XCHAR (keysym));
+      Ibyte str [1 + MAX_ICHAR_LEN];
+      Bytecount count = set_itext_ichar (str, XCHAR (keysym));
       str[count] = 0;
       keysym = intern_int (str);
     }
@@ -478,7 +478,7 @@
   if (SYMBOLP (keysym) && string_char_length (XSYMBOL (keysym)->name) == 1)
     {
       Lisp_Object i_fart_on_gcc =
-	make_char (string_emchar (XSYMBOL (keysym)->name, 0));
+	make_char (string_ichar (XSYMBOL (keysym)->name, 0));
       keysym = i_fart_on_gcc;
     }

@@ -654,7 +654,7 @@

   /* If the keysym is a one-character symbol, use the char code instead. */
   if (SYMBOLP (keysym) && string_char_length (XSYMBOL (keysym)->name) == 1)
-    keysym = make_char (string_emchar (XSYMBOL (keysym)->name, 0));
+    keysym = make_char (string_ichar (XSYMBOL (keysym)->name, 0));

   if (modifiers & XEMACS_MOD_META)     /* Utterly hateful ESC lossage */
     {
@@ -1264,7 +1264,7 @@
       if (string_char_length (XSYMBOL (*keysym)->name) == 1)
 	{
 	  Lisp_Object ream_gcc_up_the_ass =
-	    make_char (string_emchar (XSYMBOL (*keysym)->name, 0));
+	    make_char (string_ichar (XSYMBOL (*keysym)->name, 0));
 	  *keysym = ream_gcc_up_the_ass;
 	  goto fixnum_keysym;
 	}
@@ -1291,7 +1291,7 @@

   if (SYMBOLP (*keysym))
     {
-      Intbyte *name = XSTRING_DATA (XSYMBOL (*keysym)->name);
+      Ibyte *name = XSTRING_DATA (XSYMBOL (*keysym)->name);

       /* FSFmacs uses symbols with the printed representation of keysyms in
 	 their names, like 'M-x, and we use the syntax '(meta x).  So, to avoid
@@ -1899,7 +1899,7 @@
       struct key_data raw_key2;

       if (STRINGP (keys))
-	c = make_char (string_emchar (keys, idx));
+	c = make_char (string_ichar (keys, idx));
       else
 	c = XVECTOR_DATA (keys) [idx];

@@ -2225,7 +2225,7 @@

       for (i = 0; i < length; i++)
 	{
-          Emchar n = string_emchar (keys, i);
+          Ichar n = string_ichar (keys, i);
 	  define_key_parser (make_char (n), &(raw_keys[i]));
 	}
       return raw_lookup_key (keymap, raw_keys, length, 0,
@@ -2922,8 +2922,8 @@

   /* otherwise, string-sort them. */
   {
-    Intbyte *s1 = XSTRING_DATA (XSYMBOL (obj1)->name);
-    Intbyte *s2 = XSTRING_DATA (XSYMBOL (obj2)->name);
+    Ibyte *s1 = XSTRING_DATA (XSYMBOL (obj1)->name);
+    Ibyte *s2 = XSTRING_DATA (XSYMBOL (obj2)->name);
     return 0 > qxestrcmp (s1, s2) ? 1 : -1;
   }
 }
@@ -3240,7 +3240,7 @@
 	{
 	  Lisp_Object s2 = Fsingle_key_description
 	    (STRINGP (keys)
-	     ? make_char (string_emchar (keys, i))
+	     ? make_char (string_ichar (keys, i))
 	     : XVECTOR_DATA (keys)[i]);

 	  if (i == 0)
@@ -3338,12 +3338,12 @@
 */
        (chr))
 {
-  Intbyte buf[200];
-  Intbyte *p;
-  Emchar c;
+  Ibyte buf[200];
+  Ibyte *p;
+  Ichar c;
   Lisp_Object ctl_arrow = current_buffer->ctl_arrow;
   int ctl_p = !NILP (ctl_arrow);
-  Emchar printable_min = (CHAR_OR_CHAR_INTP (ctl_arrow)
+  Ichar printable_min = (CHAR_OR_CHAR_INTP (ctl_arrow)
 			  ? XCHAR_OR_CHAR_INT (ctl_arrow)
 			  : ((EQ (ctl_arrow, Qt) || NILP (ctl_arrow))
 			     ? 256 : 160));
@@ -3366,7 +3366,7 @@

   if (c >= printable_min)
     {
-      p += set_charptr_emchar (p, c);
+      p += set_itext_ichar (p, c);
     }
   else if (c < 040 && ctl_p)
     {
@@ -3399,7 +3399,7 @@
     }
   else
     {
-      p += set_charptr_emchar (p, c);
+      p += set_itext_ichar (p, c);
     }

   *p = 0;
@@ -4149,7 +4149,7 @@
   struct describe_map_closure describe_map_closure;
   Lisp_Object list = Qnil;
   struct buffer *buf = XBUFFER (buffer);
-  Emchar printable_min = (CHAR_OR_CHAR_INTP (buf->ctl_arrow)
+  Ichar printable_min = (CHAR_OR_CHAR_INTP (buf->ctl_arrow)
 			  ? XCHAR_OR_CHAR_INT (buf->ctl_arrow)
 			  : ((EQ (buf->ctl_arrow, Qt)
 			      || EQ (buf->ctl_arrow, Qnil))
@@ -4197,8 +4197,8 @@
 	  if (SYMBOLP (keysym))
 	    {
 	      Lisp_Object code = Fget (keysym, Vcharacter_set_property, Qnil);
-	      Emchar c = (CHAR_OR_CHAR_INTP (code)
-			  ? XCHAR_OR_CHAR_INT (code) : (Emchar) -1);
+	      Ichar c = (CHAR_OR_CHAR_INTP (code)
+			  ? XCHAR_OR_CHAR_INT (code) : (Ichar) -1);
 	      /* Calling Fsingle_key_description() would cons more */
 #if 0                           /* This is bogus */
 	      if (EQ (keysym, QKlinefeed))
@@ -4417,7 +4417,7 @@

   staticpro (&Vcurrent_global_map);

-  Vsingle_space_string = make_string ((const Intbyte *) " ", 1);
+  Vsingle_space_string = make_string ((const Ibyte *) " ", 1);
   staticpro (&Vsingle_space_string);
 }
--- a/src/line-number.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/line-number.c	Wed Jun 05 09:58:45 2002 +0000
@@ -158,7 +158,7 @@
    This will do nothing if the cache is uninitialized.  */
 void
 insert_invalidate_line_number_cache (struct buffer *b, Charbpos pos,
-				     const Intbyte *nonreloc, Bytecount length)
+				     const Ibyte *nonreloc, Bytecount length)
 {
   if (NILP (b->text->line_number_cache))
     return;
--- a/src/line-number.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/line-number.h	Wed Jun 05 09:58:45 2002 +0000
@@ -24,7 +24,7 @@

 void narrow_line_number_cache (struct buffer *);
 void insert_invalidate_line_number_cache (struct buffer *, Charbpos,
-					  const Intbyte *, Bytecount);
+					  const Ibyte *, Bytecount);
 void delete_invalidate_line_number_cache (struct buffer *, Charbpos, Charbpos);

 EMACS_INT buffer_line_number (struct buffer *, Charbpos, int);
--- a/src/lisp-disunion.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/lisp-disunion.h	Wed Jun 05 09:58:45 2002 +0000
@@ -68,7 +68,7 @@

  XTYPE     The type bits of a Lisp_Object
  XPNTRVAL  The value bits of a Lisp_Object storing a pointer
- XCHARVAL  The value bits of a Lisp_Object storing a Emchar
+ XCHARVAL  The value bits of a Lisp_Object storing a Ichar
  XREALINT  The value bits of a Lisp_Object storing an integer, signed
  XUINT     The value bits of a Lisp_Object storing an integer, unsigned
  INTP      Non-zero if this Lisp_Object is an integer
--- a/src/lisp-union.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/lisp-union.h	Wed Jun 05 09:58:45 2002 +0000
@@ -140,7 +140,7 @@

 DECLARE_INLINE_HEADER (
 Lisp_Object
-make_char_1 (Emchar val)
+make_char_1 (Ichar val)
 )
 {
   Lisp_Object obj;
--- a/src/lisp.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/lisp.h	Wed Jun 05 09:58:45 2002 +0000
@@ -194,20 +194,20 @@
    functions declared as such. */

 /* The data representing the text in a buffer is logically a set
-   of Intbytes, declared as follows. */
-
-typedef unsigned char Intbyte;
+   of Ibytes, declared as follows. */
+
+typedef unsigned char Ibyte;

 /* The following should be used when you are working with internal data
    but for whatever reason need to have it declared a "char *".  Examples
    are function arguments whose values are most commonly literal strings,
    or where you have to apply a stdlib string function to internal data.

-   In general, you should avoid this where possible and use Intbyte instead,
+   In general, you should avoid this where possible and use Ibyte instead,
    for consistency.  For example, the new Mule workspace contains
-   Intbyte versions of the stdlib string functions. */
-
-typedef char CIntbyte;
+   Ibyte versions of the stdlib string functions. */
+
+typedef char CIbyte;

 /* The data representing a string in "external" format (binary or any
    external encoding) is logically a set of Extbytes, declared as
@@ -230,9 +230,9 @@
 typedef unsigned char UChar_ASCII;

 /* To the user, a buffer is made up of characters.  In the non-Mule world,
-   characters and Intbytes are equivalent, restricted to the range 0 - 255.
+   characters and Ibytes are equivalent, restricted to the range 0 - 255.
    In the Mule world, many more characters are possible (19 bits worth,
-   more or less), and a character requires (typically) 1 to 4 Intbytes for
+   more or less), and a character requires (typically) 1 to 4 Ibytes for
    its representation in a buffer or string.  Note that the representation
    of a character by itself, in a variable, is very different from its
    representation in a string of text (in a buffer or Lisp string).
@@ -249,7 +249,7 @@

 /* A character, as represented on its own. */

-typedef int Emchar;
+typedef int Ichar;

 /* The "raw value" of a character as stored in the buffer.  In the default
    format, this is just the same as the character.  In fixed-width formats,
@@ -259,7 +259,7 @@
    value and look for that, than repeatedly convert each raw value in the
    buffer into a character. */

-typedef int Raw_Emchar;
+typedef int Raw_Ichar;


 #if !defined (__cplusplus) || !defined (CPLUSPLUS_INTEGRAL_CLASSES_NOT_YET)
@@ -714,9 +714,9 @@
   { return b ? x : cl (y); }
 #endif /* 0 */

-/* DECLARE_POINTER_TYPE_ARITH_COUNT (const Intbyte *, Bytecount);
+/* DECLARE_POINTER_TYPE_ARITH_COUNT (const Ibyte *, Bytecount);
    DECLARE_POINTER_TYPE_ARITH_COUNT (const Extbyte *, Bytecount); */
-DECLARE_POINTER_TYPE_ARITH_COUNT (Intbyte *, Bytecount);
+DECLARE_POINTER_TYPE_ARITH_COUNT (Ibyte *, Bytecount);
 DECLARE_POINTER_TYPE_ARITH_COUNT (Extbyte *, Bytecount);

 DECLARE_INTEGRAL_TYPE_ARITH_COUNT (int, Bytecount);
@@ -738,7 +738,7 @@
 DECLARE_INTEGRAL_TYPE_COMPARE (unsigned long, Charcount);

 #if 0 /* doesn't work */
-inline Bytecount operator - (const Intbyte *x, const Intbyte *y)	\
+inline Bytecount operator - (const Ibyte *x, const Ibyte *y)	\
   { return Bytecount (x - y); }
 #endif

@@ -1302,8 +1302,8 @@

 typedef struct
 {
-  Dynarr_declare (Intbyte);
-} Intbyte_dynarr;
+  Dynarr_declare (Ibyte);
+} Ibyte_dynarr;

 typedef struct
 {
@@ -1312,8 +1312,8 @@

 typedef struct
 {
-  Dynarr_declare (Emchar);
-} Emchar_dynarr;
+  Dynarr_declare (Ichar);
+} Ichar_dynarr;

 typedef struct
 {
@@ -2074,7 +2074,7 @@
 	} v;
     } u;
   Bytecount size_;
-  Intbyte *data_;
+  Ibyte *data_;
   Lisp_Object plist;
 };
 typedef struct Lisp_String Lisp_String;
@@ -2336,7 +2336,7 @@
 #ifdef ERROR_CHECK_TYPES

 DECLARE_INLINE_HEADER (
-Emchar
+Ichar
 XCHAR_1 (Lisp_Object obj, const char *file, int line)
 )
 {
@@ -2348,7 +2348,7 @@

 #else /* no error checking */

-#define XCHAR(x) ((Emchar) XCHARVAL (x))
+#define XCHAR(x) ((Ichar) XCHARVAL (x))

 #endif /* no error checking */

@@ -2899,7 +2899,7 @@
    returned string.  See Fgettext().

    CGETTEXT() is the same as GETTEXT() but works with char * strings
-   instead of Intbyte * strings.
+   instead of Ibyte * strings.

    build_msg_string() is a shorthand for build_string (GETTEXT (x)).
    build_msg_intstring() is a shorthand for build_intstring (GETTEXT (x)).
@@ -3346,17 +3346,17 @@
 extern EMACS_INT gc_generation_number[1];
 int c_readonly (Lisp_Object);
 int lisp_readonly (Lisp_Object);
-Lisp_Object build_intstring (const Intbyte *);
-Lisp_Object build_string (const CIntbyte *);
+Lisp_Object build_intstring (const Ibyte *);
+Lisp_Object build_string (const CIbyte *);
 Lisp_Object build_ext_string (const Extbyte *, Lisp_Object);
-Lisp_Object build_msg_intstring (const Intbyte *);
-Lisp_Object build_msg_string (const CIntbyte *);
-Lisp_Object make_string (const Intbyte *, Bytecount);
+Lisp_Object build_msg_intstring (const Ibyte *);
+Lisp_Object build_msg_string (const CIbyte *);
+Lisp_Object make_string (const Ibyte *, Bytecount);
 Lisp_Object make_ext_string (const Extbyte *, EMACS_INT, Lisp_Object);
 void init_string_ascii_begin (Lisp_Object string);
 Lisp_Object make_uninit_string (Bytecount);
 Lisp_Object make_float (double);
-Lisp_Object make_string_nocopy (const Intbyte *, Bytecount);
+Lisp_Object make_string_nocopy (const Ibyte *, Bytecount);
 void free_cons (Lisp_Object);
 void free_list (Lisp_Object);
 void free_alist (Lisp_Object);
@@ -3389,7 +3389,7 @@
 void switch_to_buffer (Lisp_Object, Lisp_Object);
 extern int find_file_compare_truenames;
 extern int find_file_use_truenames;
-Intbyte *get_initial_directory (Intbyte *pathname, Bytecount size);
+Ibyte *get_initial_directory (Ibyte *pathname, Bytecount size);
 extern Lisp_Object Vbuffer_alist;
 void set_buffer_internal (struct buffer *b);
 struct buffer *decode_buffer (Lisp_Object buffer, int allow_string);
@@ -3432,7 +3432,7 @@
 EXFUN (Fbyte_code, 3);

 DECLARE_DOESNT_RETURN (invalid_byte_code
-		       (const CIntbyte *reason, Lisp_Object frob));
+		       (const CIbyte *reason, Lisp_Object frob));

 /* Defined in callint.c */
 EXFUN (Fcall_interactively, 3);
@@ -3464,8 +3464,8 @@
 EXFUN (Fmswindows_message_box, 3);
 extern int mswindows_message_outputted;
 void mswindows_hide_console (void);
-int mswindows_output_console_string (const Intbyte *ptr, Bytecount len);
-void write_string_to_mswindows_debugging_output (Intbyte *str, Bytecount len);
+int mswindows_output_console_string (const Ibyte *ptr, Bytecount len);
+void write_string_to_mswindows_debugging_output (Ibyte *str, Bytecount len);

 /* Defined in data.c */
 EXFUN (Fadd1, 1);
@@ -3522,47 +3522,47 @@
 unsigned int lisp_to_word (Lisp_Object);

 /* Defined in dired.c */
-Lisp_Object make_directory_hash_table (const Intbyte *);
+Lisp_Object make_directory_hash_table (const Ibyte *);
 Lisp_Object wasteful_word_to_lisp (unsigned int);

 /* Defined in doc.c */
 EXFUN (Fsubstitute_command_keys, 1);

 Lisp_Object unparesseuxify_doc_string (int fd, EMACS_INT position,
-				       Intbyte *name_nonreloc,
+				       Ibyte *name_nonreloc,
 				       Lisp_Object name_reloc,
 				       int standard_doc_file);
 Lisp_Object read_doc_string (Lisp_Object);

 /* Defined in doprnt.c */
-Bytecount emacs_doprnt_va (Lisp_Object stream, const Intbyte *format_nonreloc,
+Bytecount emacs_doprnt_va (Lisp_Object stream, const Ibyte *format_nonreloc,
 			   Bytecount format_length, Lisp_Object format_reloc,
 			   va_list vargs);
-Bytecount emacs_doprnt (Lisp_Object stream, const Intbyte *format_nonreloc,
+Bytecount emacs_doprnt (Lisp_Object stream, const Ibyte *format_nonreloc,
 			Bytecount format_length, Lisp_Object format_reloc,
 			int nargs, const Lisp_Object *largs, ...);
-Lisp_Object emacs_vsprintf_string_lisp (const CIntbyte *format_nonreloc,
+Lisp_Object emacs_vsprintf_string_lisp (const CIbyte *format_nonreloc,
 				   Lisp_Object format_reloc, int nargs,
 				   const Lisp_Object *largs);
-Lisp_Object emacs_sprintf_string_lisp (const CIntbyte *format_nonreloc,
+Lisp_Object emacs_sprintf_string_lisp (const CIbyte *format_nonreloc,
 				 Lisp_Object format_reloc, int nargs, ...);
-Intbyte *emacs_vsprintf_malloc_lisp (const CIntbyte *format_nonreloc,
+Ibyte *emacs_vsprintf_malloc_lisp (const CIbyte *format_nonreloc,
 				     Lisp_Object format_reloc, int nargs,
 				     const Lisp_Object *largs,
 				     Bytecount *len_out);
-Intbyte *emacs_sprintf_malloc_lisp (Bytecount *len_out,
-				    const CIntbyte *format_nonreloc,
+Ibyte *emacs_sprintf_malloc_lisp (Bytecount *len_out,
+				    const CIbyte *format_nonreloc,
 				    Lisp_Object format_reloc, int nargs, ...);
-Lisp_Object emacs_vsprintf_string (const CIntbyte *format, va_list vargs);
-Lisp_Object emacs_sprintf_string (const CIntbyte *format, ...)
+Lisp_Object emacs_vsprintf_string (const CIbyte *format, va_list vargs);
+Lisp_Object emacs_sprintf_string (const CIbyte *format, ...)
      PRINTF_ARGS (1, 2);
-Intbyte *emacs_vsprintf_malloc (const CIntbyte *format, va_list vargs,
+Ibyte *emacs_vsprintf_malloc (const CIbyte *format, va_list vargs,
 				Bytecount *len_out);
-Intbyte *emacs_sprintf_malloc (Bytecount *len_out, const CIntbyte *format, ...)
+Ibyte *emacs_sprintf_malloc (Bytecount *len_out, const CIbyte *format, ...)
      PRINTF_ARGS (2, 3);
-Bytecount emacs_vsprintf (Intbyte *output, const CIntbyte *format,
+Bytecount emacs_vsprintf (Ibyte *output, const CIbyte *format,
 			  va_list vargs);
-Bytecount emacs_sprintf (Intbyte *output, const CIntbyte *format, ...)
+Bytecount emacs_sprintf (Ibyte *output, const CIbyte *format, ...)
      PRINTF_ARGS (2, 3);


@@ -3593,8 +3593,8 @@
 EXFUN (Fwiden, 1);

 void uncache_home_directory (void);
-Intbyte *get_home_directory (void);
-Intbyte *user_login_name (uid_t *);
+Ibyte *get_home_directory (void);
+Ibyte *user_login_name (uid_t *);
 void buffer_insert1 (struct buffer *, Lisp_Object);
 Lisp_Object make_string_from_buffer (struct buffer *, Charbpos, Charcount);
 Lisp_Object make_string_from_buffer_no_extents (struct buffer *, Charbpos, Charcount);
@@ -3618,7 +3618,7 @@
 void make_argc_argv (Lisp_Object, int *, Extbyte ***);
 void free_argc_argv (Extbyte **);
 Lisp_Object split_external_path (const Extbyte *path);
-Lisp_Object split_env_path (const CIntbyte *evarname, const Intbyte *default_);
+Lisp_Object split_env_path (const CIbyte *evarname, const Ibyte *default_);

 /* Nonzero means don't do interactive redisplay and don't change tty modes */
 extern int noninteractive, noninteractive1;
@@ -3659,50 +3659,50 @@
 					      Lisp_Object, Error_Behavior);
 DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (signal_ferror
 						  (Lisp_Object,
-						   const CIntbyte *,
+						   const CIbyte *,
 						   ...), 2, 3);
 void maybe_signal_ferror (Lisp_Object, Lisp_Object, Error_Behavior,
-			  const CIntbyte *, ...) PRINTF_ARGS (4, 5);
-Lisp_Object signal_continuable_ferror (Lisp_Object, const CIntbyte *, ...)
+			  const CIbyte *, ...) PRINTF_ARGS (4, 5);
+Lisp_Object signal_continuable_ferror (Lisp_Object, const CIbyte *, ...)
      PRINTF_ARGS (2, 3);
 Lisp_Object maybe_signal_continuable_ferror (Lisp_Object, Lisp_Object,
 					     Error_Behavior,
-					     const CIntbyte *, ...)
+					     const CIbyte *, ...)
      PRINTF_ARGS (4, 5);

-Lisp_Object build_error_data (const CIntbyte *reason, Lisp_Object frob);
-DECLARE_DOESNT_RETURN (signal_error (Lisp_Object, const CIntbyte *,
+Lisp_Object build_error_data (const CIbyte *reason, Lisp_Object frob);
+DECLARE_DOESNT_RETURN (signal_error (Lisp_Object, const CIbyte *,
 				     Lisp_Object));
-void maybe_signal_error (Lisp_Object, const CIntbyte *, Lisp_Object,
+void maybe_signal_error (Lisp_Object, const CIbyte *, Lisp_Object,
 			 Lisp_Object, Error_Behavior);
-Lisp_Object signal_continuable_error (Lisp_Object, const CIntbyte *,
+Lisp_Object signal_continuable_error (Lisp_Object, const CIbyte *,
 				      Lisp_Object);
-Lisp_Object maybe_signal_continuable_error (Lisp_Object, const CIntbyte *,
+Lisp_Object maybe_signal_continuable_error (Lisp_Object, const CIbyte *,
 					    Lisp_Object,
 					    Lisp_Object, Error_Behavior);
 DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (signal_ferror_with_frob
 						  (Lisp_Object, Lisp_Object,
-						   const CIntbyte *,
+						   const CIbyte *,
 						   ...), 3, 4);
 void maybe_signal_ferror_with_frob (Lisp_Object, Lisp_Object, Lisp_Object,
 				    Error_Behavior,
-				    const CIntbyte *, ...) PRINTF_ARGS (5, 6);
+				    const CIbyte *, ...) PRINTF_ARGS (5, 6);
 Lisp_Object signal_continuable_ferror_with_frob (Lisp_Object, Lisp_Object,
-						 const CIntbyte *,
+						 const CIbyte *,
 						 ...) PRINTF_ARGS (3, 4);
 Lisp_Object maybe_signal_continuable_ferror_with_frob (Lisp_Object,
 						       Lisp_Object,
 						       Lisp_Object,
 						       Error_Behavior,
-						       const CIntbyte *, ...)
+						       const CIbyte *, ...)
      PRINTF_ARGS (5, 6);
-DECLARE_DOESNT_RETURN (signal_error_2 (Lisp_Object, const CIntbyte *,
+DECLARE_DOESNT_RETURN (signal_error_2 (Lisp_Object, const CIbyte *,
 				       Lisp_Object, Lisp_Object));
-void maybe_signal_error_2 (Lisp_Object, const CIntbyte *, Lisp_Object,
+void maybe_signal_error_2 (Lisp_Object, const CIbyte *, Lisp_Object,
 			   Lisp_Object, Lisp_Object, Error_Behavior);
-Lisp_Object signal_continuable_error_2 (Lisp_Object, const CIntbyte *,
+Lisp_Object signal_continuable_error_2 (Lisp_Object, const CIbyte *,
 					Lisp_Object, Lisp_Object);
-Lisp_Object maybe_signal_continuable_error_2 (Lisp_Object, const CIntbyte *,
+Lisp_Object maybe_signal_continuable_error_2 (Lisp_Object, const CIbyte *,
 					      Lisp_Object, Lisp_Object,
 					      Lisp_Object,
 					      Error_Behavior);
@@ -3713,60 +3713,60 @@
 DECLARE_DOESNT_RETURN (signal_circular_list_error (Lisp_Object));
 DECLARE_DOESNT_RETURN (signal_circular_property_list_error (Lisp_Object));

-DECLARE_DOESNT_RETURN (syntax_error (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (syntax_error (const CIbyte *reason,
 				     Lisp_Object frob));
-DECLARE_DOESNT_RETURN (syntax_error_2 (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (syntax_error_2 (const CIbyte *reason,
 				       Lisp_Object frob1,
 				       Lisp_Object frob2));
-void maybe_syntax_error (const CIntbyte *, Lisp_Object, Lisp_Object,
+void maybe_syntax_error (const CIbyte *, Lisp_Object, Lisp_Object,
 			 Error_Behavior);
-DECLARE_DOESNT_RETURN (sferror (const CIntbyte *reason, Lisp_Object frob));
-DECLARE_DOESNT_RETURN (sferror_2 (const CIntbyte *reason, Lisp_Object frob1,
+DECLARE_DOESNT_RETURN (sferror (const CIbyte *reason, Lisp_Object frob));
+DECLARE_DOESNT_RETURN (sferror_2 (const CIbyte *reason, Lisp_Object frob1,
 				  Lisp_Object frob2));
-void maybe_sferror (const CIntbyte *, Lisp_Object, Lisp_Object,
+void maybe_sferror (const CIbyte *, Lisp_Object, Lisp_Object,
 		    Error_Behavior);
-DECLARE_DOESNT_RETURN (invalid_argument (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_argument (const CIbyte *reason,
 					 Lisp_Object frob));
-DECLARE_DOESNT_RETURN (invalid_argument_2 (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_argument_2 (const CIbyte *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
-void maybe_invalid_argument (const CIntbyte *, Lisp_Object, Lisp_Object,
+void maybe_invalid_argument (const CIbyte *, Lisp_Object, Lisp_Object,
 			     Error_Behavior);
-DECLARE_DOESNT_RETURN (invalid_operation (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_operation (const CIbyte *reason,
 					 Lisp_Object frob));
-DECLARE_DOESNT_RETURN (invalid_operation_2 (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_operation_2 (const CIbyte *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
-void maybe_invalid_operation (const CIntbyte *, Lisp_Object, Lisp_Object,
+void maybe_invalid_operation (const CIbyte *, Lisp_Object, Lisp_Object,
 			     Error_Behavior);
-DECLARE_DOESNT_RETURN (invalid_state (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_state (const CIbyte *reason,
 					 Lisp_Object frob));
-DECLARE_DOESNT_RETURN (invalid_state_2 (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_state_2 (const CIbyte *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
-void maybe_invalid_state (const CIntbyte *, Lisp_Object, Lisp_Object,
+void maybe_invalid_state (const CIbyte *, Lisp_Object, Lisp_Object,
 			  Error_Behavior);
-DECLARE_DOESNT_RETURN (invalid_change (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_change (const CIbyte *reason,
 					 Lisp_Object frob));
-DECLARE_DOESNT_RETURN (invalid_change_2 (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_change_2 (const CIbyte *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
-void maybe_invalid_change (const CIntbyte *, Lisp_Object, Lisp_Object,
+void maybe_invalid_change (const CIbyte *, Lisp_Object, Lisp_Object,
 			   Error_Behavior);
-DECLARE_DOESNT_RETURN (invalid_constant (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_constant (const CIbyte *reason,
 					 Lisp_Object frob));
-DECLARE_DOESNT_RETURN (invalid_constant_2 (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (invalid_constant_2 (const CIbyte *reason,
 					   Lisp_Object frob1,
 					   Lisp_Object frob2));
-void maybe_invalid_constant (const CIntbyte *, Lisp_Object, Lisp_Object,
+void maybe_invalid_constant (const CIbyte *, Lisp_Object, Lisp_Object,
 			     Error_Behavior);
-DECLARE_DOESNT_RETURN (wtaerror (const CIntbyte *reason, Lisp_Object frob));
-DECLARE_DOESNT_RETURN (out_of_memory (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (wtaerror (const CIbyte *reason, Lisp_Object frob));
+DECLARE_DOESNT_RETURN (out_of_memory (const CIbyte *reason,
 				      Lisp_Object frob));
-DECLARE_DOESNT_RETURN (stack_overflow (const CIntbyte *reason,
+DECLARE_DOESNT_RETURN (stack_overflow (const CIbyte *reason,
 				       Lisp_Object frob));
 DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (printing_unreadable_object
-						  (const CIntbyte *,
+						  (const CIbyte *,
 						   ...), 1, 2);

 Lisp_Object signal_void_function_error (Lisp_Object);
@@ -3937,7 +3937,7 @@
 void do_autoload (Lisp_Object, Lisp_Object);
 Lisp_Object un_autoload (Lisp_Object);
 void warn_when_safe_lispobj (Lisp_Object, Lisp_Object, Lisp_Object);
-void warn_when_safe (Lisp_Object, Lisp_Object, const CIntbyte *,
+void warn_when_safe (Lisp_Object, Lisp_Object, const CIbyte *,
 		     ...) PRINTF_ARGS (3, 4);


@@ -4121,13 +4121,13 @@
 void record_auto_save (void);
 void force_auto_save_soon (void);
 DECLARE_DOESNT_RETURN (report_error_with_errno (Lisp_Object errtype,
-						const CIntbyte *string,
+						const CIbyte *string,
 						Lisp_Object data));
 DECLARE_DOESNT_RETURN (report_file_type_error (Lisp_Object errtype,
 					       Lisp_Object oserrmess,
-					       const CIntbyte *string,
+					       const CIbyte *string,
 					       Lisp_Object data));
-DECLARE_DOESNT_RETURN (report_file_error (const CIntbyte *, Lisp_Object));
+DECLARE_DOESNT_RETURN (report_file_error (const CIbyte *, Lisp_Object));
 Lisp_Object lisp_strerror (int);
 Lisp_Object expand_and_dir_to_file (Lisp_Object, Lisp_Object);
 int internal_delete_file (Lisp_Object);
@@ -4361,22 +4361,22 @@

 /* Defined in minibuf.c */
 extern int minibuf_level;
-Charcount scmp_1 (const Intbyte *, const Intbyte *, Charcount, int);
+Charcount scmp_1 (const Ibyte *, const Ibyte *, Charcount, int);
 #define scmp(s1, s2, len) scmp_1 (s1, s2, len, completion_ignore_case)
 extern int completion_ignore_case;
-int regexp_ignore_completion_p (const Intbyte *, Lisp_Object,
+int regexp_ignore_completion_p (const Ibyte *, Lisp_Object,
 				Bytecount, Bytecount);
 Lisp_Object clear_echo_area (struct frame *, Lisp_Object, int);
 Lisp_Object clear_echo_area_from_print (struct frame *, Lisp_Object, int);
-void echo_area_append (struct frame *, const Intbyte *, Lisp_Object,
+void echo_area_append (struct frame *, const Ibyte *, Lisp_Object,
 		       Bytecount, Bytecount, Lisp_Object);
-void echo_area_message (struct frame *, const Intbyte *, Lisp_Object,
+void echo_area_message (struct frame *, const Ibyte *, Lisp_Object,
 			Bytecount, Bytecount, Lisp_Object);
 Lisp_Object echo_area_status (struct frame *);
 int echo_area_active (struct frame *);
 Lisp_Object echo_area_contents (struct frame *);
-void message_internal (const Intbyte *, Lisp_Object, Bytecount, Bytecount);
-void message_append_internal (const Intbyte *, Lisp_Object,
+void message_internal (const Ibyte *, Lisp_Object, Bytecount, Bytecount);
+void message_append_internal (const Ibyte *, Lisp_Object,
 			      Bytecount, Bytecount);
 void message (const char *, ...) PRINTF_ARGS (1, 2);
 void message_append (const char *, ...) PRINTF_ARGS (1, 2);
@@ -4403,22 +4403,22 @@
 /* NOTE: Do not call this with the data of a Lisp_String.  Use princ.
  * Note: stream should be defaulted before calling
  *  (eg Qnil means stdout, not Vstandard_output, etc) */
-void write_c_string (Lisp_Object stream, const CIntbyte *str);
+void write_c_string (Lisp_Object stream, const CIbyte *str);
 /* Same goes for this function. */
-void write_string (Lisp_Object stream, const Intbyte *str);
+void write_string (Lisp_Object stream, const Ibyte *str);
 /* Same goes for this function. */
-void write_string_1 (Lisp_Object stream, const Intbyte *str, Bytecount size);
+void write_string_1 (Lisp_Object stream, const Ibyte *str, Bytecount size);
 void write_eistring (Lisp_Object stream, const Eistring *ei);

 /* Higher-level (printf-style) ways to output data: */
-void write_fmt_string (Lisp_Object stream, const CIntbyte *fmt, ...);
-void write_fmt_string_lisp (Lisp_Object stream, const CIntbyte *fmt,
+void write_fmt_string (Lisp_Object stream, const CIbyte *fmt, ...);
+void write_fmt_string_lisp (Lisp_Object stream, const CIbyte *fmt,
 			    int nargs, ...);
-void stderr_out (const CIntbyte *, ...) PRINTF_ARGS (1, 2);
-void stderr_out_lisp (const CIntbyte *, int nargs, ...);
-void stdout_out (const CIntbyte *, ...) PRINTF_ARGS (1, 2);
-void debug_out (const CIntbyte *, ...) PRINTF_ARGS (1, 2);
-DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (fatal (const CIntbyte *,
+void stderr_out (const CIbyte *, ...) PRINTF_ARGS (1, 2);
+void stderr_out_lisp (const CIbyte *, int nargs, ...);
+void stdout_out (const CIbyte *, ...) PRINTF_ARGS (1, 2);
+void debug_out (const CIbyte *, ...) PRINTF_ARGS (1, 2);
+DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS (fatal (const CIbyte *,
 							   ...), 1, 2);

 /* Internal functions: */
@@ -4460,8 +4460,8 @@
 DECLARE_DOESNT_RETURN (report_network_error (const char *, Lisp_Object));
 extern Lisp_Object Vlisp_EXEC_SUFFIXES;

-Intbyte *egetenv (const CIntbyte *var);
-void eputenv (const CIntbyte *var, const CIntbyte *value);
+Ibyte *egetenv (const CIbyte *var);
+void eputenv (const CIbyte *var, const CIbyte *value);
 extern int env_initted;

 /* Defined in profile.c */
@@ -4494,12 +4494,12 @@

 struct re_pattern_buffer;
 struct re_registers;
-Charbpos scan_buffer (struct buffer *, Emchar, Charbpos, Charbpos, EMACS_INT,
+Charbpos scan_buffer (struct buffer *, Ichar, Charbpos, Charbpos, EMACS_INT,
 		      EMACS_INT *, int);
 Charbpos find_next_newline (struct buffer *, Charbpos, int);
 Charbpos find_next_newline_no_quit (struct buffer *, Charbpos, int);
 Bytebpos byte_find_next_newline_no_quit (struct buffer *, Bytebpos, int);
-Bytecount byte_find_next_emchar_in_string (Lisp_Object, Emchar, Bytecount,
+Bytecount byte_find_next_ichar_in_string (Lisp_Object, Ichar, Bytecount,
 					 EMACS_INT);
 Charbpos find_before_next_newline (struct buffer *, Charbpos, Charbpos, int);
 struct re_pattern_buffer *compile_pattern (Lisp_Object pattern,
@@ -4508,7 +4508,7 @@
 					   Lisp_Object searchobj,
 					   struct buffer *searchbuf,
 					   int posix, Error_Behavior errb);
-Bytecount fast_string_match (Lisp_Object, const Intbyte *,
+Bytecount fast_string_match (Lisp_Object, const Ibyte *,
 			     Lisp_Object, Bytecount,
 			     Bytecount, int, Error_Behavior, int);
 Bytecount fast_lisp_string_match (Lisp_Object, Lisp_Object);
@@ -4551,11 +4551,11 @@
 EXFUN (Fsymbol_plist, 1);
 EXFUN (Fsymbol_value, 1);

-unsigned int hash_string (const Intbyte *, Bytecount);
-Lisp_Object intern_int (const Intbyte *str);
-Lisp_Object intern (const CIntbyte *str);
-Lisp_Object intern_converting_underscores_to_dashes (const CIntbyte *str);
-Lisp_Object oblookup (Lisp_Object, const Intbyte *, Bytecount);
+unsigned int hash_string (const Ibyte *, Bytecount);
+Lisp_Object intern_int (const Ibyte *str);
+Lisp_Object intern (const CIbyte *str);
+Lisp_Object intern_converting_underscores_to_dashes (const CIbyte *str);
+Lisp_Object oblookup (Lisp_Object, const Ibyte *, Bytecount);
 void map_obarray (Lisp_Object, int (*) (Lisp_Object, void *), void *);
 Lisp_Object indirect_function (Lisp_Object, int);
 Lisp_Object symbol_value_in_buffer (Lisp_Object, Lisp_Object);
@@ -4585,34 +4585,34 @@
 void seed_random (long arg);

 /* Defined in text.c */
-void find_charsets_in_intbyte_string (unsigned char *charsets,
-				      const Intbyte *str,
+void find_charsets_in_ibyte_string (unsigned char *charsets,
+				      const Ibyte *str,
 				      Bytecount len);
-void find_charsets_in_emchar_string (unsigned char *charsets,
-				     const Emchar *str,
+void find_charsets_in_ichar_string (unsigned char *charsets,
+				     const Ichar *str,
 				     Charcount len);
-int intbyte_string_displayed_columns (const Intbyte *str, Bytecount len);
-int emchar_string_displayed_columns (const Emchar *str, Charcount len);
-Charcount intbyte_string_nonascii_chars (const Intbyte *str, Bytecount len);
-void convert_intbyte_string_into_emchar_dynarr (const Intbyte *str,
+int ibyte_string_displayed_columns (const Ibyte *str, Bytecount len);
+int ichar_string_displayed_columns (const Ichar *str, Charcount len);
+Charcount ibyte_string_nonascii_chars (const Ibyte *str, Bytecount len);
+void convert_ibyte_string_into_ichar_dynarr (const Ibyte *str,
 						Bytecount len,
-						Emchar_dynarr *dyn);
-Charcount convert_intbyte_string_into_emchar_string (const Intbyte *str,
+						Ichar_dynarr *dyn);
+Charcount convert_ibyte_string_into_ichar_string (const Ibyte *str,
 						     Bytecount len,
-						     Emchar *arr);
-void convert_emchar_string_into_intbyte_dynarr (Emchar *arr, int nels,
-						Intbyte_dynarr *dyn);
-Intbyte *convert_emchar_string_into_malloced_string (Emchar *arr, int nels,
+						     Ichar *arr);
+void convert_ichar_string_into_ibyte_dynarr (Ichar *arr, int nels,
+						Ibyte_dynarr *dyn);
+Ibyte *convert_ichar_string_into_malloced_string (Ichar *arr, int nels,
 						    Bytecount *len_out);
-Bytecount copy_text_between_formats (const Intbyte *src, Bytecount srclen,
+Bytecount copy_text_between_formats (const Ibyte *src, Bytecount srclen,
 				     Internal_Format srcfmt,
 				     Lisp_Object srcobj,
-				     Intbyte *dst, Bytecount dstlen,
+				     Ibyte *dst, Bytecount dstlen,
 				     Internal_Format dstfmt,
 				     Lisp_Object dstobj,
 				     Bytecount *src_used);
 Bytecount copy_buffer_text_out (struct buffer *buf, Bytebpos pos,
-				Bytecount len, Intbyte *dst, Bytecount dstlen,
+				Bytecount len, Ibyte *dst, Bytecount dstlen,
 				Internal_Format dstfmt, Lisp_Object dstobj,
 				Bytecount *src_used);

@@ -4687,8 +4687,8 @@

 #ifdef ENABLE_COMPOSITE_CHARS

-Emchar lookup_composite_char (Intbyte *str, int len);
-Lisp_Object composite_char_string (Emchar ch);
+Ichar lookup_composite_char (Ibyte *str, int len);
+Lisp_Object composite_char_string (Ichar ch);
 #endif /* ENABLE_COMPOSITE_CHARS */

 EXFUN (Ffind_charset, 1);
@@ -4720,205 +4720,205 @@
 extern Lisp_Object Vcharset_chinese_big5_2;
 extern Lisp_Object Vcharset_composite;

-Emchar Lstream_get_emchar_1 (Lstream *stream, int first_char);
-int Lstream_fput_emchar (Lstream *stream, Emchar ch);
-void Lstream_funget_emchar (Lstream *stream, Emchar ch);
-
-DECLARE_INLINE_HEADER (Intbyte *qxestrdup (const Intbyte *s))
+Ichar Lstream_get_ichar_1 (Lstream *stream, int first_char);
+int Lstream_fput_ichar (Lstream *stream, Ichar ch);
+void Lstream_funget_ichar (Lstream *stream, Ichar ch);
+
+DECLARE_INLINE_HEADER (Ibyte *qxestrdup (const Ibyte *s))
 {
-  return (Intbyte *) xstrdup ((const char *) s);
+  return (Ibyte *) xstrdup ((const char *) s);
 }

-DECLARE_INLINE_HEADER (Bytecount qxestrlen (const Intbyte *s))
+DECLARE_INLINE_HEADER (Bytecount qxestrlen (const Ibyte *s))
 {
   return strlen ((const char *) s);
 }

-DECLARE_INLINE_HEADER (Charcount qxestrcharlen (const Intbyte *s))
+DECLARE_INLINE_HEADER (Charcount qxestrcharlen (const Ibyte *s))
 {
   return bytecount_to_charcount (s, qxestrlen (s));
 }

-DECLARE_INLINE_HEADER (int qxestrcmp (const Intbyte *s1,
-				      const Intbyte *s2))
+DECLARE_INLINE_HEADER (int qxestrcmp (const Ibyte *s1,
+				      const Ibyte *s2))
 {
   return strcmp ((const char *) s1, (const char *) s2);
 }

-DECLARE_INLINE_HEADER (int qxestrcmp_c (const Intbyte *s1,
+DECLARE_INLINE_HEADER (int qxestrcmp_c (const Ibyte *s1,
 					const char *s2))
 {
   return strcmp ((const char *) s1, s2);
 }

-DECLARE_INLINE_HEADER (int qxestrncmp (const Intbyte *string1,
-				       const Intbyte *string2,
+DECLARE_INLINE_HEADER (int qxestrncmp (const Ibyte *string1,
+				       const Ibyte *string2,
 				       Bytecount count))
 {
   return strncmp ((const char *) string1, (const char *) string2,
 		  (size_t) count);
 }

-DECLARE_INLINE_HEADER (int qxestrncmp_c (const Intbyte *string1,
+DECLARE_INLINE_HEADER (int qxestrncmp_c (const Ibyte *string1,
 					 const char *string2,
 					 Bytecount count))
 {
   return strncmp ((const char *) string1, string2, (size_t) count);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrcpy (Intbyte *strDest,
-					   const Intbyte *strSource))
+DECLARE_INLINE_HEADER (Ibyte *qxestrcpy (Ibyte *strDest,
+					   const Ibyte *strSource))
 {
-  return (Intbyte *) strcpy ((char *) strDest, (const char *) strSource);
+  return (Ibyte *) strcpy ((char *) strDest, (const char *) strSource);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrcpy_c (Intbyte *strDest,
+DECLARE_INLINE_HEADER (Ibyte *qxestrcpy_c (Ibyte *strDest,
 					     const char *strSource))
 {
-  return (Intbyte *) strcpy ((char *) strDest, strSource);
+  return (Ibyte *) strcpy ((char *) strDest, strSource);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrncpy (Intbyte *strDest,
-					    const Intbyte *strSource,
+DECLARE_INLINE_HEADER (Ibyte *qxestrncpy (Ibyte *strDest,
+					    const Ibyte *strSource,
 					    Bytecount count))
 {
-  return (Intbyte *) strncpy ((char *) strDest, (const char *) strSource,
+  return (Ibyte *) strncpy ((char *) strDest, (const char *) strSource,
 			      (size_t) count);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrncpy_c (Intbyte *strDest,
+DECLARE_INLINE_HEADER (Ibyte *qxestrncpy_c (Ibyte *strDest,
 					      const char *strSource,
 					      Bytecount count))
 {
-  return (Intbyte *) strncpy ((char *) strDest, strSource, (size_t) count);
+  return (Ibyte *) strncpy ((char *) strDest, strSource, (size_t) count);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrcat (Intbyte *strDest,
-					   const Intbyte *strSource))
+DECLARE_INLINE_HEADER (Ibyte *qxestrcat (Ibyte *strDest,
+					   const Ibyte *strSource))
 {
-  return (Intbyte *) strcat ((char *) strDest, (const char *) strSource);
+  return (Ibyte *) strcat ((char *) strDest, (const char *) strSource);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrcat_c (Intbyte *strDest,
+DECLARE_INLINE_HEADER (Ibyte *qxestrcat_c (Ibyte *strDest,
 					     const char *strSource))
 {
-  return (Intbyte *) strcat ((char *) strDest, strSource);
+  return (Ibyte *) strcat ((char *) strDest, strSource);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrncat (Intbyte *strDest,
-					    const Intbyte *strSource,
+DECLARE_INLINE_HEADER (Ibyte *qxestrncat (Ibyte *strDest,
+					    const Ibyte *strSource,
 					    Bytecount count))
 {
-  return (Intbyte *) strncat ((char *) strDest, (const char *) strSource,
+  return (Ibyte *) strncat ((char *) strDest, (const char *) strSource,
 			      (size_t) count);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrncat_c (Intbyte *strDest,
+DECLARE_INLINE_HEADER (Ibyte *qxestrncat_c (Ibyte *strDest,
 					      const char *strSource,
 					      Bytecount count))
 {
-  return (Intbyte *) strncat ((char *) strDest, strSource, (size_t) count);
+  return (Ibyte *) strncat ((char *) strDest, strSource, (size_t) count);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrchr (const Intbyte *s, Emchar c))
+DECLARE_INLINE_HEADER (Ibyte *qxestrchr (const Ibyte *s, Ichar c))
 {
   assert (c >= 0 && c <= 255);
-  return (Intbyte *) strchr ((const char *) s, c);
+  return (Ibyte *) strchr ((const char *) s, c);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrrchr (const Intbyte *s, Emchar c))
+DECLARE_INLINE_HEADER (Ibyte *qxestrrchr (const Ibyte *s, Ichar c))
 {
   assert (c >= 0 && c <= 255);
-  return (Intbyte *) strrchr ((const char *) s, c);
+  return (Ibyte *) strrchr ((const char *) s, c);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrstr (const Intbyte *string1,
-					   const Intbyte *string2))
+DECLARE_INLINE_HEADER (Ibyte *qxestrstr (const Ibyte *string1,
+					   const Ibyte *string2))
 {
-  return (Intbyte *) strstr ((const char *) string1, (const char *) string2);
+  return (Ibyte *) strstr ((const char *) string1, (const char *) string2);
 }

-DECLARE_INLINE_HEADER (Bytecount qxestrcspn (const Intbyte *string,
-					     const CIntbyte *strCharSet))
+DECLARE_INLINE_HEADER (Bytecount qxestrcspn (const Ibyte *string,
+					     const CIbyte *strCharSet))
 {
   return (Bytecount) strcspn ((const char *) string, strCharSet);
 }

-DECLARE_INLINE_HEADER (Bytecount qxestrspn (const Intbyte *string,
-					    const CIntbyte *strCharSet))
+DECLARE_INLINE_HEADER (Bytecount qxestrspn (const Ibyte *string,
+					    const CIbyte *strCharSet))
 {
   return (Bytecount) strspn ((const char *) string, strCharSet);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrpbrk (const Intbyte *string,
-					    const CIntbyte *strCharSet))
+DECLARE_INLINE_HEADER (Ibyte *qxestrpbrk (const Ibyte *string,
+					    const CIbyte *strCharSet))
 {
-  return (Intbyte *) strpbrk ((const char *) string, strCharSet);
+  return (Ibyte *) strpbrk ((const char *) string, strCharSet);
 }

-DECLARE_INLINE_HEADER (Intbyte *qxestrtok (Intbyte *strToken,
-					   const CIntbyte *strDelimit))
+DECLARE_INLINE_HEADER (Ibyte *qxestrtok (Ibyte *strToken,
+					   const CIbyte *strDelimit))
 {
-  return (Intbyte *) strtok ((char *) strToken, strDelimit);
+  return (Ibyte *) strtok ((char *) strToken, strDelimit);
 }

-DECLARE_INLINE_HEADER (double qxestrtod (const Intbyte *nptr,
-					 Intbyte **endptr))
+DECLARE_INLINE_HEADER (double qxestrtod (const Ibyte *nptr,
+					 Ibyte **endptr))
 {
   return strtod ((const char *) nptr, (char **) endptr);
 }

-DECLARE_INLINE_HEADER (long qxestrtol (const Intbyte *nptr, Intbyte **endptr,
+DECLARE_INLINE_HEADER (long qxestrtol (const Ibyte *nptr, Ibyte **endptr,
 				       int base))
 {
   return strtol ((const char *) nptr, (char **) endptr, base);
 }

-DECLARE_INLINE_HEADER (unsigned long qxestrtoul (const Intbyte *nptr,
-						 Intbyte **endptr,
+DECLARE_INLINE_HEADER (unsigned long qxestrtoul (const Ibyte *nptr,
+						 Ibyte **endptr,
 						 int base))
 {
   return strtoul ((const char *) nptr, (char **) endptr, base);
 }

-DECLARE_INLINE_HEADER (int qxeatoi (const Intbyte *string))
+DECLARE_INLINE_HEADER (int qxeatoi (const Ibyte *string))
 {
   return atoi ((const char *) string);
 }

-int qxesprintf (Intbyte *buffer, const CIntbyte *format, ...)
+int qxesprintf (Ibyte *buffer, const CIbyte *format, ...)
      PRINTF_ARGS (2, 3);

 /* Do not use POSIX locale routines.  Not Mule-correct. */
 #define qxestrcoll DO NOT USE.
 #define qxestrxfrm DO NOT USE.

-int qxestrcasecmp (const Intbyte *s1, const Intbyte *s2);
-int qxestrcasecmp_c (const Intbyte *s1, const Char_ASCII *s2);
-int qxestrcasecmp_i18n (const Intbyte *s1, const Intbyte *s2);
+int qxestrcasecmp (const Ibyte *s1, const Ibyte *s2);
+int qxestrcasecmp_c (const Ibyte *s1, const Char_ASCII *s2);
+int qxestrcasecmp_i18n (const Ibyte *s1, const Ibyte *s2);
 int ascii_strcasecmp (const Char_ASCII *s1, const Char_ASCII *s2);
 int lisp_strcasecmp (Lisp_Object s1, Lisp_Object s2);
 int lisp_strcasecmp_i18n (Lisp_Object s1, Lisp_Object s2);
-int qxestrncasecmp (const Intbyte *s1, const Intbyte *s2, Bytecount len);
-int qxestrncasecmp_c (const Intbyte *s1, const Char_ASCII *s2, Bytecount len);
-int qxestrncasecmp_i18n (const Intbyte *s1, const Intbyte *s2, Bytecount len);
+int qxestrncasecmp (const Ibyte *s1, const Ibyte *s2, Bytecount len);
+int qxestrncasecmp_c (const Ibyte *s1, const Char_ASCII *s2, Bytecount len);
+int qxestrncasecmp_i18n (const Ibyte *s1, const Ibyte *s2, Bytecount len);
 int ascii_strncasecmp (const Char_ASCII *s1, const Char_ASCII *s2,
 		       Bytecount len);
-int qxememcmp (const Intbyte *s1, const Intbyte *s2, Bytecount len);
-int qxememcmp4 (const Intbyte *s1, Bytecount len1,
-		const Intbyte *s2, Bytecount len2);
-int qxememcasecmp (const Intbyte *s1, const Intbyte *s2, Bytecount len);
-int qxememcasecmp4 (const Intbyte *s1, Bytecount len1,
-		    const Intbyte *s2, Bytecount len2);
-int qxetextcmp (const Intbyte *s1, Bytecount len1,
-		const Intbyte *s2, Bytecount len2);
-int qxetextcmp_matching (const Intbyte *s1, Bytecount len1,
-			 const Intbyte *s2, Bytecount len2,
+int qxememcmp (const Ibyte *s1, const Ibyte *s2, Bytecount len);
+int qxememcmp4 (const Ibyte *s1, Bytecount len1,
+		const Ibyte *s2, Bytecount len2);
+int qxememcasecmp (const Ibyte *s1, const Ibyte *s2, Bytecount len);
+int qxememcasecmp4 (const Ibyte *s1, Bytecount len1,
+		    const Ibyte *s2, Bytecount len2);
+int qxetextcmp (const Ibyte *s1, Bytecount len1,
+		const Ibyte *s2, Bytecount len2);
+int qxetextcmp_matching (const Ibyte *s1, Bytecount len1,
+			 const Ibyte *s2, Bytecount len2,
 			 Charcount *matching);
-int qxetextcasecmp (const Intbyte *s1, Bytecount len1,
-		    const Intbyte *s2, Bytecount len2);
-int qxetextcasecmp_matching (const Intbyte *s1, Bytecount len1,
-			     const Intbyte *s2, Bytecount len2,
+int qxetextcasecmp (const Ibyte *s1, Bytecount len1,
+		    const Ibyte *s2, Bytecount len2);
+int qxetextcasecmp_matching (const Ibyte *s1, Bytecount len1,
+			     const Ibyte *s2, Bytecount len2,
 			     Charcount *matching);

 void buffer_mule_signal_inserted_region (struct buffer *buf, Charbpos start,
@@ -4954,7 +4954,7 @@

 /* Defined in unex*.c */
 #ifdef WIN32_NATIVE
-int unexec (Intbyte *, Intbyte *, uintptr_t, uintptr_t, uintptr_t);
+int unexec (Ibyte *, Ibyte *, uintptr_t, uintptr_t, uintptr_t);
 #else
 int unexec (Extbyte *, Extbyte *, uintptr_t, uintptr_t, uintptr_t);
 #endif
--- a/src/lread.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/lread.c	Wed Jun 05 09:58:45 2002 +0000
@@ -223,14 +223,14 @@


 /* Handle unreading and rereading of characters. */
-static Emchar
+static Ichar
 readchar (Lisp_Object readcharfun)
 {
   /* This function can GC */

   if (BUFFERP (readcharfun))
     {
-      Emchar c;
+      Ichar c;
       struct buffer *b = XBUFFER (readcharfun);

       if (!BUFFER_LIVE_P (b))
@@ -245,7 +245,7 @@
     }
   else if (LSTREAMP (readcharfun))
     {
-      Emchar c = Lstream_get_emchar (XLSTREAM (readcharfun));
+      Ichar c = Lstream_get_ichar (XLSTREAM (readcharfun));
 #ifdef DEBUG_XEMACS /* testing Mule */
       static int testing_mule = 0; /* Change via debugger */
       if (testing_mule)
@@ -259,7 +259,7 @@
     }
   else if (MARKERP (readcharfun))
     {
-      Emchar c;
+      Ichar c;
       Charbpos mpos = marker_position (readcharfun);
       struct buffer *inbuffer = XMARKER (readcharfun)->buffer;

@@ -283,7 +283,7 @@
    If the stream is a user function, call it with the char as argument.  */

 static void
-unreadchar (Lisp_Object readcharfun, Emchar c)
+unreadchar (Lisp_Object readcharfun, Ichar c)
 {
   if (c == -1)
     /* Don't back up the pointer if we're unreading the end-of-input mark,
@@ -293,7 +293,7 @@
     BUF_SET_PT (XBUFFER (readcharfun), BUF_PT (XBUFFER (readcharfun)) - 1);
   else if (LSTREAMP (readcharfun))
     {
-      Lstream_unget_emchar (XLSTREAM (readcharfun), c);
+      Lstream_unget_ichar (XLSTREAM (readcharfun), c);
 #ifdef DEBUG_XEMACS /* testing Mule */
       {
         static int testing_mule = 0; /* Set this using debugger */
@@ -313,7 +313,7 @@
 static Lisp_Object read0 (Lisp_Object readcharfun);
 static Lisp_Object read1 (Lisp_Object readcharfun);
 static Lisp_Object read_list (Lisp_Object readcharfun,
-                              Emchar terminator,
+                              Ichar terminator,
                               int allow_dotted_lists,
 			      int check_for_doc_references);

@@ -523,7 +523,7 @@
      Unix truly sucks. */
   if (XSTRING_LENGTH (file) > 0)
     {
-      Intbyte *foundstr;
+      Ibyte *foundstr;
       int foundlen;

       fd = locate_file (Vload_path, file,
@@ -544,7 +544,7 @@
 	    }
 	}

-      foundstr = (Intbyte *) ALLOCA (XSTRING_LENGTH (found) + 1);
+      foundstr = (Ibyte *) ALLOCA (XSTRING_LENGTH (found) + 1);
       qxestrcpy (foundstr, XSTRING_DATA (found));
       foundlen = qxestrlen (foundstr);

@@ -861,11 +861,11 @@
    FUN returns non-zero. */
 static void
 locate_file_map_suffixes (Lisp_Object filename, Lisp_Object suffixes,
-			  int (*fun) (Intbyte *, void *),
+			  int (*fun) (Ibyte *, void *),
 			  void *arg)
 {
   /* This function can GC */
-  Intbyte *fn;
+  Ibyte *fn;
   int fn_len, max;

   /* Calculate maximum size of any filename made from
@@ -888,7 +888,7 @@
     max = XSTRING_LENGTH (suffixes);

   fn_len = XSTRING_LENGTH (filename);
-  fn = (Intbyte *) ALLOCA (max + fn_len + 1);
+  fn = (Ibyte *) ALLOCA (max + fn_len + 1);
   memcpy (fn, XSTRING_DATA (filename), fn_len);

   /* Loop over suffixes.  */
@@ -918,11 +918,11 @@
   else
     {
       /* Case c) */
-      const Intbyte *nsuffix = XSTRING_DATA (suffixes);
+      const Ibyte *nsuffix = XSTRING_DATA (suffixes);

       while (1)
 	{
-	  Intbyte *esuffix = qxestrchr (nsuffix, ':');
+	  Ibyte *esuffix = qxestrchr (nsuffix, ':');
 	  Bytecount lsuffix = esuffix ? esuffix - nsuffix :
 	    qxestrlen (nsuffix);

@@ -949,7 +949,7 @@
 };

 static int
-locate_file_in_directory_mapper (Intbyte *fn, void *arg)
+locate_file_in_directory_mapper (Ibyte *fn, void *arg)
 {
   struct locate_file_in_directory_mapper_closure *closure =
     (struct locate_file_in_directory_mapper_closure *) arg;
@@ -1057,7 +1057,7 @@
 }

 static int
-locate_file_construct_suffixed_files_mapper (Intbyte *fn, void *arg)
+locate_file_construct_suffixed_files_mapper (Ibyte *fn, void *arg)
 {
   Lisp_Object *tail = (Lisp_Object *) arg;
   *tail = Fcons (build_intstring (fn), *tail);
@@ -1314,7 +1314,7 @@
               int printflag)
 {
   /* This function can GC */
-  REGISTER Emchar c;
+  REGISTER Ichar c;
   REGISTER Lisp_Object val = Qnil;
   int speccount = specpdl_depth ();
   struct gcpro gcpro1, gcpro2;
@@ -1564,7 +1564,7 @@

   if (CONSP (val) && UNBOUNDP (XCAR (val)))
     {
-      Emchar c = XCHAR (XCDR (val));
+      Ichar c = XCHAR (XCDR (val));
       free_cons (val);
       return Fsignal (Qinvalid_read_syntax,
 		      list1 (Fchar_to_string (make_char (c))));
@@ -1573,11 +1573,11 @@
   return val;
 }

-static Emchar
+static Ichar
 read_escape (Lisp_Object readcharfun)
 {
   /* This function can GC */
-  Emchar c = readchar (readcharfun);
+  Ichar c = readchar (readcharfun);

   if (c < 0)
     signal_error (Qend_of_file, 0, READCHARFUN_MAYBE (readcharfun));
@@ -1653,7 +1653,7 @@
     case '7':
       /* An octal escape, as in ANSI C.  */
       {
-	REGISTER Emchar i = c - '0';
+	REGISTER Ichar i = c - '0';
 	REGISTER int count = 0;
 	while (++count < 3)
 	  {
@@ -1677,12 +1677,12 @@
 	 mean, anyways, if the internal representation is hidden?
          This is also consistent with the treatment of octal escapes. */
       {
-	REGISTER Emchar i = 0;
+	REGISTER Ichar i = 0;
 	REGISTER int count = 0;
 	while (++count <= 2)
 	  {
 	    c = readchar (readcharfun);
-	    /* Remember, can't use isdigit(), isalpha() etc. on Emchars */
+	    /* Remember, can't use isdigit(), isalpha() etc. on Ichars */
 	    if      (c >= '0' && c <= '9')  i = (i << 4) + (c - '0');
 	    else if (c >= 'a' && c <= 'f')  i = (i << 4) + (c - 'a') + 10;
             else if (c >= 'A' && c <= 'F')  i = (i << 4) + (c - 'A') + 10;
@@ -1709,10 +1709,10 @@

 /* read symbol-constituent stuff into `Vread_buffer_stream'. */
 static Bytecount
-read_atom_0 (Lisp_Object readcharfun, Emchar firstchar, int *saw_a_backslash)
+read_atom_0 (Lisp_Object readcharfun, Ichar firstchar, int *saw_a_backslash)
 {
   /* This function can GC */
-  Emchar c = ((firstchar) >= 0 ? firstchar : readchar (readcharfun));
+  Ichar c = ((firstchar) >= 0 ? firstchar : readchar (readcharfun));
   Lstream_rewind (XLSTREAM (Vread_buffer_stream));

   *saw_a_backslash = 0;
@@ -1735,7 +1735,7 @@
 	    signal_error (Qend_of_file, 0, READCHARFUN_MAYBE (readcharfun));
 	  *saw_a_backslash = 1;
 	}
-      Lstream_put_emchar (XLSTREAM (Vread_buffer_stream), c);
+      Lstream_put_ichar (XLSTREAM (Vread_buffer_stream), c);
       QUIT;
       c = readchar (readcharfun);
     }
@@ -1743,17 +1743,17 @@
   if (c >= 0)
     unreadchar (readcharfun, c);
   /* blasted terminating 0 */
-  Lstream_put_emchar (XLSTREAM (Vread_buffer_stream), 0);
+  Lstream_put_ichar (XLSTREAM (Vread_buffer_stream), 0);
   Lstream_flush (XLSTREAM (Vread_buffer_stream));

   return Lstream_byte_count (XLSTREAM (Vread_buffer_stream)) - 1;
 }

-static Lisp_Object parse_integer (const Intbyte *buf, Bytecount len, int base);
+static Lisp_Object parse_integer (const Ibyte *buf, Bytecount len, int base);

 static Lisp_Object
 read_atom (Lisp_Object readcharfun,
-           Emchar firstchar,
+           Ichar firstchar,
            int uninterned_symbol)
 {
   /* This function can GC */
@@ -1804,7 +1804,7 @@
 		return make_int (number);
 	      }
 #else
-              return parse_integer ((Intbyte *) read_ptr, len, 10);
+              return parse_integer ((Ibyte *) read_ptr, len, 10);
 #endif
 	    }
 	}
@@ -1817,10 +1817,10 @@
   {
     Lisp_Object sym;
     if (uninterned_symbol)
-      sym = Fmake_symbol ( make_string ((Intbyte *) read_ptr, len));
+      sym = Fmake_symbol ( make_string ((Ibyte *) read_ptr, len));
     else
       {
-	Lisp_Object name = make_string ((Intbyte *) read_ptr, len);
+	Lisp_Object name = make_string ((Ibyte *) read_ptr, len);
 	sym = Fintern (name, Qnil);
       }
     return sym;
@@ -1829,10 +1829,10 @@


 static Lisp_Object
-parse_integer (const Intbyte *buf, Bytecount len, int base)
+parse_integer (const Ibyte *buf, Bytecount len, int base)
 {
-  const Intbyte *lim = buf + len;
-  const Intbyte *p = buf;
+  const Ibyte *lim = buf + len;
+  const Ibyte *p = buf;
   EMACS_UINT num = 0;
   int negativland = 0;

@@ -1919,7 +1919,7 @@
   while (1)
     {
       unsigned char bit;
-      Emchar c = readchar (readcharfun);
+      Ichar c = readchar (readcharfun);
       if (c == '0')
 	bit = 0;
       else if (c == '1')
@@ -1993,7 +1993,7 @@
 static Lisp_Object
 read_structure (Lisp_Object readcharfun)
 {
-  Emchar c = readchar (readcharfun);
+  Ichar c = readchar (readcharfun);
   Lisp_Object list = Qnil;
   Lisp_Object orig_list = Qnil;
   Lisp_Object already_seen = Qnil;
@@ -2082,11 +2082,11 @@

 /* Get the next character; filter out whitespace and comments */

-static Emchar
+static Ichar
 reader_nextchar (Lisp_Object readcharfun)
 {
   /* This function can GC */
-  Emchar c;
+  Ichar c;

  retry:
   QUIT;
@@ -2131,7 +2131,7 @@
 static Lisp_Object
 read1 (Lisp_Object readcharfun)
 {
-  Emchar c;
+  Ichar c;

 retry:
   c = reader_nextchar (readcharfun);
@@ -2142,7 +2142,7 @@
       {
 #ifdef LISP_BACKQUOTES	/* old backquote compatibility in lisp reader */
 	/* if this is disabled, then other code in eval.c must be enabled */
-	Emchar ch = reader_nextchar (readcharfun);
+	Ichar ch = reader_nextchar (readcharfun);
 	switch (ch)
 	  {
 	  case '`':
@@ -2228,7 +2228,7 @@
 	c = readchar (readcharfun);
 	unreadchar (readcharfun, c);

-	/* Can't use isdigit on Emchars */
+	/* Can't use isdigit on Ichars */
 	if (c < '0' || c > '9')
 	  return noseeum_cons (Qunbound, make_char ('.'));

@@ -2290,7 +2290,7 @@
 	      while (1)
 		{
 		  Lisp_Object beg, end, plist;
-		  Emchar ch;
+		  Ichar ch;
 		  int invalid = 0;

 		  beg = read1 (readcharfun);
@@ -2535,7 +2535,7 @@
 		  cancel = 1;
 	      }
 	    else
-	      Lstream_put_emchar (XLSTREAM (Vread_buffer_stream), c);
+	      Lstream_put_ichar (XLSTREAM (Vread_buffer_stream), c);
 	    QUIT;
 	  }
 	if (c < 0)
@@ -2578,7 +2578,7 @@
 isfloat_string (const char *cp)
 {
   int state = 0;
-  const Intbyte *ucp = (const Intbyte *) cp;
+  const Ibyte *ucp = (const Ibyte *) cp;

   if (*ucp == '+' || *ucp == '-')
     ucp++;
@@ -2626,7 +2626,7 @@

 static void *
 sequence_reader (Lisp_Object readcharfun,
-                 Emchar terminator,
+                 Ichar terminator,
                  void *state,
                  void * (*conser) (Lisp_Object readcharfun,
                                    void *state, Charcount len))
@@ -2635,7 +2635,7 @@

   for (len = 0; ; len++)
     {
-      Emchar ch;
+      Ichar ch;

       QUIT;
       ch = reader_nextchar (readcharfun);
@@ -2661,7 +2661,7 @@
     Lisp_Object tail;
     int length;
     int allow_dotted_lists;
-    Emchar terminator;
+    Ichar terminator;
   };

 static void *
@@ -2675,7 +2675,7 @@
   if (CONSP (elt) && UNBOUNDP (XCAR (elt)))
     {
       Lisp_Object tem = elt;
-      Emchar ch;
+      Ichar ch;

       elt = XCDR (elt);
       free_cons (tem);
@@ -2757,7 +2757,7 @@

 static Lisp_Object
 read_list (Lisp_Object readcharfun,
-           Emchar terminator,
+           Ichar terminator,
            int allow_dotted_lists,
 	   int check_for_doc_references)
 {
@@ -2851,7 +2851,7 @@

 static Lisp_Object
 read_vector (Lisp_Object readcharfun,
-             Emchar terminator)
+             Ichar terminator)
 {
   Lisp_Object tem;
   Lisp_Object *p;
@@ -2888,7 +2888,7 @@
 }

 static Lisp_Object
-read_compiled_function (Lisp_Object readcharfun, Emchar terminator)
+read_compiled_function (Lisp_Object readcharfun, Ichar terminator)
 {
   /* Accept compiled functions at read-time so that we don't
      have to build them at load-time. */
--- a/src/lrecord.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/lrecord.h	Wed Jun 05 09:58:45 2002 +0000
@@ -352,7 +352,7 @@
    {
      struct lrecord_header lheader;
      Bytecount size;
-     Intbyte *data;
+     Ibyte *data;
      Lisp_Object plist;
    };
--- a/src/lstream.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/lstream.c	Wed Jun 05 09:58:45 2002 +0000
@@ -313,7 +313,7 @@
 	      /* Go back to the beginning of the last (and possibly partial)
 		 character, and bump forward to see if the character is
 		 complete. */
-	      VALIDATE_CHARPTR_BACKWARD (dataend);
+	      VALIDATE_IBYTEPTR_BACKWARD (dataend);
 	      if (dataend + rep_bytes_by_first_byte (*dataend) != data + size)
 		/* If not, chop the size down to ignore the last char
 		   and stash it away for next time. */
@@ -674,7 +674,7 @@
       /* It's quite possible for us to get passed an incomplete
 	 character at the end.  We need to spit back that
 	 incomplete character. */
-      Bytecount newoff = validate_intbyte_string_backward (p, off);
+      Bytecount newoff = validate_ibyte_string_backward (p, off);
       if (newoff < off)
 	{
 	  Lstream_unread (lstr, p + newoff, off - newoff);
@@ -984,7 +984,7 @@
 {
   int fd;
   int pty_max_bytes;
-  Intbyte eof_char;
+  Ibyte eof_char;
   int starting_pos;
   int current_pos;
   int end_pos;
@@ -1182,7 +1182,7 @@
      in pty-flushing mode. */
   if (need_newline)
     {
-      Intbyte nl = '\n';
+      Ibyte nl = '\n';
       Bytecount retval2 = str->allow_quit ?
 	write_allowing_quit (str->fd, &nl, 1) :
 	retry_write (str->fd, &nl, 1);
@@ -1265,7 +1265,7 @@

 void
 filedesc_stream_set_pty_flushing (Lstream *stream, int pty_max_bytes,
-				  Intbyte eof_char)
+				  Ibyte eof_char)
 {
   struct filedesc_stream *str = FILEDESC_STREAM_DATA (stream);
   str->pty_max_bytes = pty_max_bytes;
@@ -1323,15 +1323,15 @@
   struct lisp_string_stream *str = LISP_STRING_STREAM_DATA (stream);
   /* Don't lose if the string shrank past us ... */
   Bytecount offset = min (str->offset, XSTRING_LENGTH (str->obj));
-  Intbyte *strstart = XSTRING_DATA (str->obj);
-  Intbyte *start = strstart + offset;
+  Ibyte *strstart = XSTRING_DATA (str->obj);
+  Ibyte *start = strstart + offset;

   /* ... or if someone changed the string and we ended up in the
      middle of a character. */
   /* Being in the middle of a character is `normal' unless
      LSTREAM_NO_PARTIAL_CHARS - mrb */
   if (stream->flags & LSTREAM_FL_NO_PARTIAL_CHARS)
-    VALIDATE_CHARPTR_BACKWARD (start);
+    VALIDATE_IBYTEPTR_BACKWARD (start);
   offset = start - strstart;
   size = min (size, (Bytecount) (str->end - offset));
   memcpy (data, start, size);
@@ -1351,9 +1351,9 @@
   /* ... or if someone changed the string and we ended up in the
      middle of a character. */
   {
-    Intbyte *strstart = XSTRING_DATA (str->obj);
-    Intbyte *start = strstart + pos;
-    VALIDATE_CHARPTR_BACKWARD (start);
+    Ibyte *strstart = XSTRING_DATA (str->obj);
+    Ibyte *start = strstart + pos;
+    VALIDATE_IBYTEPTR_BACKWARD (start);
     pos = start - strstart;
   }
   str->offset = pos;
@@ -1521,7 +1521,7 @@

 /* Note: If you have a dynarr whose type is not unsigned_char_dynarr
    but which is really just an unsigned_char_dynarr (e.g. its type
-   is Intbyte or Extbyte), just cast to unsigned_char_dynarr. */
+   is Ibyte or Extbyte), just cast to unsigned_char_dynarr. */

 #define DYNARR_STREAM_DATA(stream) \
   LSTREAM_TYPE_DATA (stream, dynarr)
@@ -1664,7 +1664,7 @@
 }

 static Bytecount
-lisp_buffer_reader (Lstream *stream, Intbyte *data, Bytecount size)
+lisp_buffer_reader (Lstream *stream, Ibyte *data, Bytecount size)
 {
   struct lisp_buffer_stream *str = LISP_BUFFER_STREAM_DATA (stream);
   Bytebpos start;
@@ -1692,7 +1692,7 @@
   if (EQ (buf->selective_display, Qt) && str->flags & LSTR_SELECTIVE)
     {
       /* What a kludge.  What a kludge.  What a kludge. */
-      Intbyte *p;
+      Ibyte *p;
       for (p = data; p < data + src_used; p++)
 	if (*p == '\r')
 	  *p = '\n';
@@ -1703,7 +1703,7 @@
 }

 static Bytecount
-lisp_buffer_writer (Lstream *stream, const Intbyte *data,
+lisp_buffer_writer (Lstream *stream, const Ibyte *data,
 		    Bytecount size)
 {
   struct lisp_buffer_stream *str = LISP_BUFFER_STREAM_DATA (stream);
--- a/src/lstream.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/lstream.h	Wed Jun 05 09:58:45 2002 +0000
@@ -355,50 +355,50 @@


 /************************************************************************/
-/*             working with an Lstream as a stream of Emchars           */
+/*             working with an Lstream as a stream of Ichars           */
 /************************************************************************/

 #ifdef MULE

 DECLARE_INLINE_HEADER (
-Emchar
-Lstream_get_emchar (Lstream *stream)
+Ichar
+Lstream_get_ichar (Lstream *stream)
 )
 {
   int c = Lstream_getc (stream);
   return (c < 0x80		/* c == EOF || byte_ascii_p (c) */
-	  ? (Emchar) c
-	  : Lstream_get_emchar_1 (stream, c));
+	  ? (Ichar) c
+	  : Lstream_get_ichar_1 (stream, c));
 }

-/* Write an Emchar to a stream.  Return value is 0 for success, -1 for
+/* Write an Ichar to a stream.  Return value is 0 for success, -1 for
    failure. */

 DECLARE_INLINE_HEADER (
 int
-Lstream_put_emchar (Lstream *stream, Emchar ch)
+Lstream_put_ichar (Lstream *stream, Ichar ch)
 )
 {
-  return emchar_ascii_p (ch) ?
+  return ichar_ascii_p (ch) ?
     Lstream_putc (stream, ch) :
-    Lstream_fput_emchar (stream, ch);
+    Lstream_fput_ichar (stream, ch);
 }

 DECLARE_INLINE_HEADER (
 void
-Lstream_unget_emchar (Lstream *stream, Emchar ch)
+Lstream_unget_ichar (Lstream *stream, Ichar ch)
 )
 {
-  if (emchar_ascii_p (ch))
+  if (ichar_ascii_p (ch))
     Lstream_ungetc (stream, ch);
   else
-    Lstream_funget_emchar (stream, ch);
+    Lstream_funget_ichar (stream, ch);
 }
 #else /* not MULE */

-# define Lstream_get_emchar(stream) Lstream_getc (stream)
-# define Lstream_put_emchar(stream, ch) Lstream_putc (stream, ch)
-# define Lstream_unget_emchar(stream, ch) Lstream_ungetc (stream, ch)
+# define Lstream_get_ichar(stream) Lstream_getc (stream)
+# define Lstream_put_ichar(stream, ch) Lstream_putc (stream, ch)
+# define Lstream_unget_ichar(stream, ch) Lstream_ungetc (stream, ch)

 #endif /* not MULE */

@@ -433,7 +433,7 @@
 					 int flags);
 void filedesc_stream_set_pty_flushing (Lstream *stream,
 				       int pty_max_bytes,
-				       Intbyte eof_char);
+				       Ibyte eof_char);
 int filedesc_stream_fd (Lstream *stream);
 Lisp_Object make_lisp_string_input_stream (Lisp_Object string,
 					   Bytecount offset,
--- a/src/md5.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/md5.c	Wed Jun 05 09:58:45 2002 +0000
@@ -553,7 +553,7 @@
   /* Get the data while doing the conversion.  */
   while (1)
     {
-      Intbyte tempbuf[1024];	/* some random amount */
+      Ibyte tempbuf[1024];	/* some random amount */
       Bytecount size_in_bytes =
 	Lstream_read (XLSTREAM (instream), tempbuf, sizeof (tempbuf));
       if (!size_in_bytes)
--- a/src/menubar-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/menubar-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -121,7 +121,7 @@

 /*
  * Translate X accelerator syntax to win32 accelerator syntax.
- * accel = (Emchar*) to receive the accelerator character
+ * accel = (Ichar*) to receive the accelerator character
  *         or NULL to suppress accelerators in the menu or dialog item.
  *
  * %% is replaced with %
@@ -135,10 +135,10 @@
  */

 Lisp_Object
-mswindows_translate_menu_or_dialog_item (Lisp_Object item, Emchar *accel)
+mswindows_translate_menu_or_dialog_item (Lisp_Object item, Ichar *accel)
 {
   Bytecount len = XSTRING_LENGTH (item);
-  Intbyte *it = (Intbyte *) ALLOCA (2 * len + 42), *ptr = it;
+  Ibyte *it = (Ibyte *) ALLOCA (2 * len + 42), *ptr = it;

   memcpy (ptr, XSTRING_DATA (item), len + 1);
   if (accel)
@@ -146,7 +146,7 @@

   /* Escape '&' as '&&' */

-  while ((ptr = (Intbyte *) memchr (ptr, '&', len - (ptr - it))) != NULL)
+  while ((ptr = (Ibyte *) memchr (ptr, '&', len - (ptr - it))) != NULL)
     {
       memmove (ptr + 1, ptr, (len - (ptr - it)) + 1);
       len++;
@@ -156,7 +156,7 @@
   /* Replace XEmacs accelerator '%_' with Windows accelerator '&'
      and `%%' with `%'. */
   ptr = it;
-  while ((ptr = (Intbyte *) memchr (ptr, '%', len - (ptr - it))) != NULL)
+  while ((ptr = (Ibyte *) memchr (ptr, '%', len - (ptr - it))) != NULL)
     {
       if (*(ptr + 1) == '_')
 	{
@@ -164,7 +164,7 @@
 	    {
 	      *ptr = '&';
 	      if (!*accel)
-		*accel = DOWNCASE (0, charptr_emchar (ptr + 2));
+		*accel = DOWNCASE (0, itext_ichar (ptr + 2));
 	      memmove (ptr + 1, ptr + 2, len - (ptr - it + 2) + 1);
 	      len--;
 	    }
@@ -189,7 +189,7 @@
       /* Force a default accelerator */
       ptr = it;
       memmove (ptr + 1, ptr, len + 1);
-      *accel = DOWNCASE (0, charptr_emchar (ptr + 1));
+      *accel = DOWNCASE (0, itext_ichar (ptr + 1));
       *ptr = '&';

       len++;
@@ -204,7 +204,7 @@
  */

 static Lisp_Object
-displayable_menu_item (Lisp_Object gui_item, int bar_p, Emchar *accel)
+displayable_menu_item (Lisp_Object gui_item, int bar_p, Ichar *accel)
 {
   Lisp_Object left, right = Qnil;

@@ -336,7 +336,7 @@
       Lisp_Object gui_item = allocate_gui_item ();
       Lisp_Gui_Item *pgui_item = XGUI_ITEM (gui_item);
       struct gcpro gcpro1, gcpro2, gcpro3;
-      Emchar accel;
+      Ichar accel;
       Extbyte *itemext;

       GCPRO3 (gui_item, path, *accel_list);
@@ -394,7 +394,7 @@
       Lisp_Object gui_item = gui_parse_item_keywords (item);
       Lisp_Gui_Item *pgui_item = XGUI_ITEM (gui_item);
       struct gcpro gcpro1, gcpro2;
-      Emchar accel;
+      Ichar accel;
       Extbyte *itemext;

       GCPRO2 (gui_item, *accel_list);
@@ -672,7 +672,7 @@
 }

 int
-mswindows_char_is_accelerator (struct frame *f, Emchar ch)
+mswindows_char_is_accelerator (struct frame *f, Ichar ch)
 {
   Lisp_Object hash = FRAME_MSWINDOWS_MENU_HASH_TABLE (f);
--- a/src/menubar-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/menubar-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -117,7 +117,7 @@

   if (STRINGP (desc))
     {
-      Intbyte *string_chars = XSTRING_DATA (desc);
+      Ibyte *string_chars = XSTRING_DATA (desc);
       wv->type = (separator_string_p (string_chars) ? SEPARATOR_TYPE :
 		  TEXT_TYPE);
       if (wv->type == SEPARATOR_TYPE)
@@ -252,7 +252,7 @@
 	      title_wv->enabled = 1;
 	      title_wv->next = sep_wv;
 	      sep_wv->type = SEPARATOR_TYPE;
-	      sep_wv->value = menu_separator_style_and_to_external ((Intbyte *) "==");
+	      sep_wv->value = menu_separator_style_and_to_external ((Ibyte *) "==");
 	      sep_wv->next = 0;

 	      wv->contents = title_wv;
--- a/src/menubar.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/menubar.c	Wed Jun 05 09:58:45 2002 +0000
@@ -331,10 +331,10 @@
   struct buffer *buf = decode_buffer (buffer, 0);
   Charcount end;
   int i;
-  Intbyte *name_data;
-  Intbyte *string_result;
-  Intbyte *string_result_ptr;
-  Emchar elt;
+  Ibyte *name_data;
+  Ibyte *string_result;
+  Ibyte *string_result_ptr;
+  Ichar elt;
   int expecting_underscore = 0;

   CHECK_STRING (name);
@@ -342,11 +342,11 @@
   end = string_char_length (name);
   name_data = XSTRING_DATA (name);

-  string_result = (Intbyte *) ALLOCA (end * MAX_EMCHAR_LEN);
+  string_result = (Ibyte *) ALLOCA (end * MAX_ICHAR_LEN);
   string_result_ptr = string_result;
   for (i = 0; i < end; i++)
     {
-      elt = charptr_emchar (name_data);
+      elt = itext_ichar (name_data);
       elt = DOWNCASE (buf, elt);
       if (expecting_underscore)
 	{
@@ -355,20 +355,20 @@
 	    {
 	    case '%':
 	      /* Allow `%%' to mean `%'.  */
-	      string_result_ptr += set_charptr_emchar (string_result_ptr, '%');
+	      string_result_ptr += set_itext_ichar (string_result_ptr, '%');
 	      break;
 	    case '_':
 	      break;
 	    default:
-	      string_result_ptr += set_charptr_emchar (string_result_ptr, '%');
-	      string_result_ptr += set_charptr_emchar (string_result_ptr, elt);
+	      string_result_ptr += set_itext_ichar (string_result_ptr, '%');
+	      string_result_ptr += set_itext_ichar (string_result_ptr, elt);
 	    }
 	}
       else if (elt == '%')
 	expecting_underscore = 1;
       else
-	string_result_ptr += set_charptr_emchar (string_result_ptr, elt);
-      INC_CHARPTR (name_data);
+	string_result_ptr += set_itext_ichar (string_result_ptr, elt);
+      INC_IBYTEPTR (name_data);
     }

   if (string_result_ptr - string_result == XSTRING_LENGTH (name)
--- a/src/minibuf.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/minibuf.c	Wed Jun 05 09:58:45 2002 +0000
@@ -206,7 +206,7 @@
    if IGNORE_CASE is true. */

 Charcount
-scmp_1 (const Intbyte *s1, const Intbyte *s2, Charcount len,
+scmp_1 (const Ibyte *s1, const Ibyte *s2, Charcount len,
 	int ignore_case)
 {
   Charcount l = len;
@@ -215,14 +215,14 @@
     {
       while (l)
         {
-          Emchar c1 = DOWNCASE (0, charptr_emchar (s1));
-          Emchar c2 = DOWNCASE (0, charptr_emchar (s2));
+          Ichar c1 = DOWNCASE (0, itext_ichar (s1));
+          Ichar c2 = DOWNCASE (0, itext_ichar (s2));

           if (c1 == c2)
             {
               l--;
-              INC_CHARPTR (s1);
-              INC_CHARPTR (s2);
+              INC_IBYTEPTR (s1);
+              INC_IBYTEPTR (s2);
             }
           else
             break;
@@ -230,11 +230,11 @@
     }
   else
     {
-      while (l && charptr_emchar (s1) == charptr_emchar (s2))
+      while (l && itext_ichar (s1) == itext_ichar (s2))
 	{
 	  l--;
-	  INC_CHARPTR (s1);
-	  INC_CHARPTR (s2);
+	  INC_IBYTEPTR (s1);
+	  INC_IBYTEPTR (s2);
 	}
     }

@@ -245,7 +245,7 @@


 int
-regexp_ignore_completion_p (const Intbyte *nonreloc,
+regexp_ignore_completion_p (const Ibyte *nonreloc,
 			    Lisp_Object reloc, Bytecount offset,
 			    Bytecount length)
 {
@@ -622,8 +622,8 @@
           /* Reject alternatives that start with space
 	     unless the input starts with space.  */
 	  && ((string_char_length (string) > 0 &&
-	       string_emchar (string, 0) == ' ')
-	      || string_emchar (eltstring, 0) != ' ')
+	       string_ichar (string, 0) == ' ')
+	      || string_ichar (eltstring, 0) != ' ')
 	  && (0 > scmp (XSTRING_DATA (eltstring),
                         XSTRING_DATA (string),
                         slength)))
@@ -708,7 +708,7 @@
 }

 void
-echo_area_append (struct frame *f, const Intbyte *nonreloc, Lisp_Object reloc,
+echo_area_append (struct frame *f, const Ibyte *nonreloc, Lisp_Object reloc,
 		  Bytecount offset, Bytecount length,
 		  Lisp_Object label)
 {
@@ -761,7 +761,7 @@
 }

 void
-echo_area_message (struct frame *f, const Intbyte *nonreloc,
+echo_area_message (struct frame *f, const Ibyte *nonreloc,
 		   Lisp_Object reloc, Bytecount offset, Bytecount length,
 		   Lisp_Object label)
 {
@@ -805,7 +805,7 @@
 /* Dump an informative message to the echo area.  This function takes a
    string in internal format. */
 void
-message_internal (const Intbyte *nonreloc, Lisp_Object reloc,
+message_internal (const Ibyte *nonreloc, Lisp_Object reloc,
 		  Bytecount offset, Bytecount length)
 {
   /* This function can call lisp  */
@@ -815,7 +815,7 @@
 }

 void
-message_append_internal (const Intbyte *nonreloc, Lisp_Object reloc,
+message_append_internal (const Ibyte *nonreloc, Lisp_Object reloc,
 			 Bytecount offset, Bytecount length)
 {
   /* This function can call lisp  */
@@ -829,7 +829,7 @@
    on the format string; message_no_translate() does not. */

 static void
-message_1 (const CIntbyte *fmt, va_list args)
+message_1 (const CIbyte *fmt, va_list args)
 {
   /* This function can call lisp */
   if (fmt)
@@ -847,7 +847,7 @@
 }

 static void
-message_append_1 (const CIntbyte *fmt, va_list args)
+message_append_1 (const CIbyte *fmt, va_list args)
 {
   /* This function can call lisp */
   if (fmt)
--- a/src/mule-ccl.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/mule-ccl.c	Wed Jun 05 09:58:45 2002 +0000
@@ -728,23 +728,23 @@
 	  }							\
 	else							\
 	  {							\
-	    Intbyte work[MAX_EMCHAR_LEN];			\
+	    Ibyte work[MAX_ICHAR_LEN];			\
 	    int len;						\
-	    len = non_ascii_set_charptr_emchar (work, ch);	\
+	    len = non_ascii_set_itext_ichar (work, ch);	\
 	    Dynarr_add_many (destination, work, len);		\
 	  }							\
       }								\
     else							\
       {								\
-	if (!emchar_multibyte_p(ch))				\
+	if (!ichar_multibyte_p(ch))				\
 	  {							\
 	    Dynarr_add (destination, ch);			\
 	  }							\
 	else							\
 	  {							\
-	    Intbyte work[MAX_EMCHAR_LEN];			\
+	    Ibyte work[MAX_ICHAR_LEN];			\
 	    int len;						\
-	    len = non_ascii_set_charptr_emchar (work, ch);	\
+	    len = non_ascii_set_itext_ichar (work, ch);	\
 	    Dynarr_add_many (destination, work, len);		\
 	  }							\
       }								\
@@ -755,7 +755,7 @@
    cannot handle a multibyte string except for Control-1 characters. */
 #define CCL_WRITE_STRING(len)					\
   do {								\
-    Intbyte work[MAX_EMCHAR_LEN];				\
+    Ibyte work[MAX_ICHAR_LEN];				\
     int ch, bytes;						\
     if (!destination)						\
       CCL_INVALID_CMD;						\
@@ -783,7 +783,7 @@
 	      }							\
 	    else						\
 	      {							\
-		bytes = non_ascii_set_charptr_emchar (work, ch); \
+		bytes = non_ascii_set_itext_ichar (work, ch); \
 		Dynarr_add_many (destination, work, len);	\
 	      }							\
 	  }							\
@@ -794,13 +794,13 @@
 	  {							\
 	    ch = ((XINT (ccl_prog[ic + (i / 3)]))		\
 		  >> ((2 - (i % 3)) * 8)) & 0xFF;		\
-	    if (!emchar_multibyte_p(ch))				\
+	    if (!ichar_multibyte_p(ch))				\
 	      {							\
 		Dynarr_add (destination, ch);			\
 	      }							\
 	    else						\
 	      {							\
-		bytes = non_ascii_set_charptr_emchar (work, ch); \
+		bytes = non_ascii_set_itext_ichar (work, ch); \
 		Dynarr_add_many (destination, work, len);	\
 	      }							\
 	  }							\
@@ -828,7 +828,7 @@


 /* Set C to the character code made from CHARSET and CODE.  This is
-   like make_emchar but check the validity of CHARSET and CODE.  If they
+   like make_ichar but check the validity of CHARSET and CODE.  If they
    are not valid, set C to (CODE & 0xFF) because that is usually the
    case that CCL_ReadMultibyteChar2 read an invalid code and it set
    CODE to that invalid byte.  */
@@ -848,7 +848,7 @@
 								\
 	if ((code) >= 256)					\
 	  c2 = c1, c1 = ((code) >> 7) & 0x7F;			\
-	(c) = make_emchar (charset, c1, c2);			\
+	(c) = make_ichar (charset, c1, c2);			\
       }								\
     else							\
       (c) = (code) & 0xFF;						\
--- a/src/mule-charset.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/mule-charset.c	Wed Jun 05 09:58:45 2002 +0000
@@ -204,7 +204,7 @@
 static Lisp_Object
 make_charset (int id, Lisp_Object name, int rep_bytes,
 	      int type, int columns, int graphic,
-	      Intbyte final, int direction,  Lisp_Object short_name,
+	      Ibyte final, int direction,  Lisp_Object short_name,
 	      Lisp_Object long_name, Lisp_Object doc,
 	      Lisp_Object reg, int overwrite)
 {
@@ -470,7 +470,7 @@
        (name, doc_string, props))
 {
   int id, dimension = 1, chars = 94, graphic = 0, columns = -1;
-  Intbyte final = 0;
+  Ibyte final = 0;
   int direction = CHARSET_LEFT_TO_RIGHT;
   int type;
   Lisp_Object registry = Qnil;
@@ -606,7 +606,7 @@

   if (temporary)
     {
-      Intbyte tempname[80];
+      Ibyte tempname[80];

       qxesprintf (tempname, "___temporary___%d__", id);
       name = intern_int (tempname);
@@ -654,7 +654,7 @@
 {
   Lisp_Object new_charset = Qnil;
   int id, dimension, columns, graphic;
-  Intbyte final;
+  Ibyte final;
   int direction, type;
   Lisp_Object registry, doc_string, short_name, long_name;
   Lisp_Charset *cs;
--- a/src/mule-coding.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/mule-coding.c	Wed Jun 05 09:58:45 2002 +0000
@@ -116,7 +116,7 @@
 	      /* Previous character was first byte of Shift-JIS Kanji char. */
 	      if (byte_shift_jis_two_byte_2_p (c))
 		{
-		  Intbyte e1, e2;
+		  Ibyte e1, e2;

 		  Dynarr_add (dst, LEADING_BYTE_JAPANESE_JISX0208);
 		  DECODE_SHIFT_JIS (ch, c, e1, e2);
@@ -151,13 +151,13 @@
     {
       while (n--)
 	{
-	  Intbyte c = *src++;
+	  Ibyte c = *src++;
 	  if (byte_ascii_p (c))
 	    {
 	      Dynarr_add (dst, c);
 	      ch = 0;
 	    }
-	  else if (intbyte_leading_byte_p (c))
+	  else if (ibyte_leading_byte_p (c))
 	    ch = (c == LEADING_BYTE_KATAKANA_JISX0201 ||
 		  c == LEADING_BYTE_JAPANESE_JISX0208_1978 ||
 		  c == LEADING_BYTE_JAPANESE_JISX0208) ? c : 0;
@@ -206,7 +206,7 @@
       byte_shift_jis_two_byte_2_p (s2))
     {
       DECODE_SHIFT_JIS (s1, s2, c1, c2);
-      return make_char (make_emchar (Vcharset_japanese_jisx0208,
+      return make_char (make_ichar (Vcharset_japanese_jisx0208,
 				     c1 & 0x7F, c2 & 0x7F));
     }
   else
@@ -223,7 +223,7 @@
   int c1, c2, s1, s2;

   CHECK_CHAR_COERCE_INT (character);
-  BREAKUP_EMCHAR (XCHAR (character), charset, c1, c2);
+  BREAKUP_ICHAR (XCHAR (character), charset, c1, c2);
   if (EQ (charset, Vcharset_japanese_jisx0208))
     {
       ENCODE_SHIFT_JIS (c1 | 0x80, c2 | 0x80, s1, s2);
@@ -451,7 +451,7 @@
 	      /* Previous character was first byte of Big5 char. */
 	      if (byte_big5_two_byte_2_p (c))
 		{
-		  Intbyte b1, b2, b3;
+		  Ibyte b1, b2, b3;
 		  DECODE_BIG5 (ch, c, b1, b2, b3);
 		  Dynarr_add (dst, b1);
 		  Dynarr_add (dst, b2);
@@ -480,13 +480,13 @@
     {
       while (n--)
 	{
-	  Intbyte c = *src++;
+	  Ibyte c = *src++;
 	  if (byte_ascii_p (c))
 	    {
 	      /* ASCII. */
 	      Dynarr_add (dst, c);
 	    }
-	  else if (intbyte_leading_byte_p (c))
+	  else if (ibyte_leading_byte_p (c))
 	    {
 	      if (c == LEADING_BYTE_CHINESE_BIG5_1 ||
 		  c == LEADING_BYTE_CHINESE_BIG5_2)
@@ -522,7 +522,7 @@
   return orign;
 }

-Emchar
+Ichar
 decode_big5_char (int b1, int b2)
 {
   if (byte_big5_two_byte_1_p (b1) &&
@@ -534,7 +534,7 @@

       DECODE_BIG5 (b1, b2, leading_byte, c1, c2);
       charset = charset_by_leading_byte (leading_byte);
-      return make_emchar (charset, c1 & 0x7F, c2 & 0x7F);
+      return make_ichar (charset, c1 & 0x7F, c2 & 0x7F);
     }
   else
     return -1;
@@ -552,7 +552,7 @@
 */
        (code))
 {
-  Emchar ch;
+  Ichar ch;

   CHECK_CONS (code);
   CHECK_INT (XCAR (code));
@@ -576,7 +576,7 @@
   int c1, c2, b1, b2;

   CHECK_CHAR_COERCE_INT (character);
-  BREAKUP_EMCHAR (XCHAR (character), charset, c1, c2);
+  BREAKUP_ICHAR (XCHAR (character), charset, c1, c2);
   if (EQ (charset, Vcharset_chinese_big5_1) ||
       EQ (charset, Vcharset_chinese_big5_2))
     {
@@ -1223,7 +1223,7 @@
 }

 static Lisp_Object
-charset_by_attributes_or_create_one (int type, Intbyte final, int dir)
+charset_by_attributes_or_create_one (int type, Ibyte final, int dir)
 {
   Lisp_Object charset = charset_by_attributes (type, final, dir);

@@ -1802,23 +1802,23 @@
 		  break;
 		case ISO_ESC_END_COMPOSITE:
 		  {
-		    Intbyte comstr[MAX_EMCHAR_LEN];
+		    Ibyte comstr[MAX_ICHAR_LEN];
 		    Bytecount len;
-		    Emchar emch = lookup_composite_char (Dynarr_atp (dst, 0),
+		    Ichar emch = lookup_composite_char (Dynarr_atp (dst, 0),
 							 Dynarr_length (dst));
 		    dst = real_dst;
-		    len = set_charptr_emchar (comstr, emch);
+		    len = set_itext_ichar (comstr, emch);
 		    Dynarr_add_many (dst, comstr, len);
 		    break;
 		  }
 #else
 		case ISO_ESC_START_COMPOSITE:
 		  {
-		    Intbyte comstr[MAX_EMCHAR_LEN];
+		    Ibyte comstr[MAX_ICHAR_LEN];
 		    Bytecount len;
-		    Emchar emch = make_emchar (Vcharset_composite, c - '0' + ' ',
+		    Ichar emch = make_ichar (Vcharset_composite, c - '0' + ' ',
 					     0);
-		    len = set_charptr_emchar (comstr, emch);
+		    len = set_itext_ichar (comstr, emch);
 		    Dynarr_add_many (dst, comstr, len);
 		    break;
 		  }
@@ -2101,11 +2101,11 @@
 /* Convert internally-formatted data to ISO2022 format. */

 static Bytecount
-iso2022_encode (struct coding_stream *str, const Intbyte *src,
+iso2022_encode (struct coding_stream *str, const Ibyte *src,
 		unsigned_char_dynarr *dst, Bytecount n)
 {
   unsigned char charmask;
-  Intbyte c;
+  Ibyte c;
   unsigned char char_boundary;
   unsigned int ch             = str->ch;
   Lisp_Object codesys         = str->codesys;
@@ -2121,7 +2121,7 @@
   /* flags for handling composite chars.  We do a little switcheroo
      on the source while we're outputting the composite char. */
   Bytecount saved_n = 0;
-  const Intbyte *saved_src = NULL;
+  const Ibyte *saved_src = NULL;
   int in_composite = 0;
 #endif /* ENABLE_COMPOSITE_CHARS */

@@ -2184,7 +2184,7 @@
 	  char_boundary = 1;
 	}

-      else if (intbyte_leading_byte_p (c) || intbyte_leading_byte_p (ch))
+      else if (ibyte_leading_byte_p (c) || ibyte_leading_byte_p (ch))
 	{ /* Processing Leading Byte */
 	  ch = 0;
 	  charset = charset_by_leading_byte (c);
@@ -2333,7 +2333,7 @@
 			    }
 			  else
 			    {
-			      Emchar emch = make_emchar (Vcharset_composite,
+			      Ichar emch = make_ichar (Vcharset_composite,
 						       ch & 0x7F, c & 0x7F);
 			      Lisp_Object lstr = composite_char_string (emch);
 			      saved_n = n;
--- a/src/mule-wnnfns.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/mule-wnnfns.c	Wed Jun 05 09:58:45 2002 +0000
@@ -517,7 +517,7 @@
          fname and comment must be ASCII strings! */
       val =
 	Fcons (Fcons (make_int (dicinfo->dic_no),
-		      list4 (make_string ((Intbyte *) (dicinfo->fname),
+		      list4 (make_string ((Ibyte *) (dicinfo->fname),
 					  strlen (dicinfo->fname)),
 			     make_string (comment, strlen ((char *) comment)),
 			     make_int (dicinfo->gosuu),
@@ -1190,7 +1190,7 @@
   if ((snum = check_wnn_server_type ()) == -1) return Qnil;
   if (!wnnfns_buf[snum]) return Qnil;
   if (jl_fuzokugo_get (wnnfns_buf[snum], fname) < 0) return Qnil;
-  return make_string ((Intbyte *) fname, strlen (fname));
+  return make_string ((Ibyte *) fname, strlen (fname));
 }


@@ -1981,7 +1981,7 @@

   while ((ch = *mp++) != 0)
     {
-      if (intbyte_leading_byte_p (ch))
+      if (ibyte_leading_byte_p (ch))
 	{
 	  switch (ch)
 	    {
--- a/src/ndir.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/ndir.h	Wed Jun 05 09:58:45 2002 +0000
@@ -48,7 +48,7 @@

 #ifdef WIN32_NATIVE

-DIR *mswindows_opendir (const Intbyte *filename);
+DIR *mswindows_opendir (const Ibyte *filename);
 int mswindows_closedir (DIR *dirp);
 struct direct *mswindows_readdir (DIR *dirp);
--- a/src/nt.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/nt.c	Wed Jun 05 09:58:45 2002 +0000
@@ -113,7 +113,7 @@
 }

 struct passwd *
-getpwnam (const Intbyte *name)
+getpwnam (const Ibyte *name)
 {
   struct passwd *pw;

@@ -244,11 +244,11 @@
 }

 /* Parse the root part of file name, if present.  Return length and
-   optionally store pointer to Intbyte after root.  */
+   optionally store pointer to Ibyte after root.  */
 static Bytecount
-parse_root (Intbyte *name, Intbyte **pPath)
+parse_root (Ibyte *name, Ibyte **pPath)
 {
-  Intbyte *start = name;
+  Ibyte *start = name;

   if (name == NULL)
     return 0;
@@ -283,8 +283,8 @@
 }

 /* Get long base name for name; name is assumed to be absolute.  */
-static Intbyte *
-get_long_basename (Intbyte *name)
+static Ibyte *
+get_long_basename (Ibyte *name)
 {
   WIN32_FIND_DATAW find_data;
   HANDLE dir_handle;
@@ -298,7 +298,7 @@
   dir_handle = qxeFindFirstFile (nameext, &find_data);
   if (dir_handle != INVALID_HANDLE_VALUE)
     {
-      Intbyte *fileint;
+      Ibyte *fileint;

       TSTR_TO_C_STRING_MALLOC (find_data.cFileName, fileint);
       FindClose (dir_handle);
@@ -308,12 +308,12 @@
 }

 /* Get long name for file, if possible (assumed to be absolute).  */
-Intbyte *
-mswindows_get_long_filename (Intbyte *name)
+Ibyte *
+mswindows_get_long_filename (Ibyte *name)
 {
-  Intbyte *full = mswindows_canonicalize_filename (name);
-  Intbyte *p;
-  Intbyte *q;
+  Ibyte *full = mswindows_canonicalize_filename (name);
+  Ibyte *p;
+  Ibyte *q;
   DECLARE_EISTRING (o);
   Bytecount len;

@@ -323,7 +323,7 @@

   while (p != NULL && *p)
     {
-      Intbyte *component;
+      Ibyte *component;

       q = p;
       p = qxestrchr (q, '\\');
@@ -351,9 +351,9 @@
 }

 static int
-is_unc_volume (const Intbyte *filename)
+is_unc_volume (const Ibyte *filename)
 {
-  const Intbyte *ptr = filename;
+  const Ibyte *ptr = filename;

   if (!IS_DIRECTORY_SEP (ptr[0]) || !IS_DIRECTORY_SEP (ptr[1]) || !ptr[2])
     return 0;
@@ -369,7 +369,7 @@
 #define REG_ROOT "SOFTWARE\\XEmacs\\XEmacs"

 static LPBYTE
-nt_get_resource (Intbyte *key, LPDWORD lpdwtype)
+nt_get_resource (Ibyte *key, LPDWORD lpdwtype)
 {
   LPBYTE lpvalue;
   HKEY hrootkey = NULL;
@@ -476,7 +476,7 @@
 	    if (dwType == REG_EXPAND_SZ)
 	      {
 		Extbyte *buf = NULL;
-		Intbyte *envval;
+		Ibyte *envval;
 		Charcount cch;

 		cch = qxeExpandEnvironmentStrings ((Extbyte *) lpval, buf, 0);
@@ -487,7 +487,7 @@
 	      }
 	    else if (dwType == REG_SZ)
 	      {
-		Intbyte *envval;
+		Ibyte *envval;

 		TSTR_TO_C_STRING (lpval, envval);
 		eputenv (env_vars[i], envval);
@@ -514,7 +514,7 @@
 	Lisp_Object str = XCAR (tail);
 	if (STRINGP (str))
 	  {
-	    Intbyte *dat = XSTRING_DATA (str);
+	    Ibyte *dat = XSTRING_DATA (str);
 	    if (qxestrncasecmp (dat, "PATH=", 5) == 0)
 	      memcpy (dat, "PATH=", 5);
 	    else if (qxestrncasecmp (dat, "COMSPEC=", 8) == 0)
@@ -564,12 +564,12 @@
   DWORD timestamp;

   /* actual volume info */
-  Intbyte *root_dir;
+  Ibyte *root_dir;
   DWORD serialnum;
   DWORD maxcomp;
   DWORD flags;
-  Intbyte *name;
-  Intbyte *type;
+  Ibyte *name;
+  Ibyte *type;
 } volume_info_data;

 /* Global referenced by various functions.  */
@@ -593,7 +593,7 @@
 static volume_info_data *volume_cache = NULL;

 static volume_info_data *
-lookup_volume_info (Intbyte *root_dir)
+lookup_volume_info (Ibyte *root_dir)
 {
   volume_info_data *info;

@@ -604,7 +604,7 @@
 }

 static void
-add_volume_info (Intbyte *root_dir, volume_info_data *info)
+add_volume_info (Ibyte *root_dir, volume_info_data *info)
 {
   info->root_dir = qxestrdup (root_dir);
   info->next = volume_cache;
@@ -616,10 +616,10 @@
    performance penalty (~2ms on 486 for local drives, 7.5ms for local
    cdrom drive, ~5-10ms or more for remote drives on LAN).  */
 static volume_info_data *
-get_cached_volume_information (Intbyte *root_dir)
+get_cached_volume_information (Ibyte *root_dir)
 {
   volume_info_data *info;
-  Intbyte *default_root;
+  Ibyte *default_root;

   /* NULL for root_dir means use root from current directory.  */
   if (root_dir == NULL)
@@ -660,7 +660,7 @@
   if (isalpha (root_dir[0]) && !fixed [DRIVE_INDEX (root_dir[0])])
     {
       Extbyte remote_name[256 * XETCHAR_SIZE];
-      Intbyte drive[3] = { root_dir[0], ':' };
+      Ibyte drive[3] = { root_dir[0], ':' };
       Extbyte *driveext;

       C_STRING_TO_TSTR (drive, driveext);
@@ -717,12 +717,12 @@
 /* Get information on the volume where name is held; set path pointer to
    start of pathname in name (past UNC header\volume header if present).  */
 static int
-get_volume_info (const Intbyte *name, const Intbyte **pPath)
+get_volume_info (const Ibyte *name, const Ibyte **pPath)
 {
   /* We probably only need a couple of bytes, but let's be generous in
      case this function gets changed */
-  Intbyte *temp = alloca_array (Intbyte, qxestrlen (name) + 10);
-  Intbyte *rootname = NULL;  /* default to current volume */
+  Ibyte *temp = alloca_array (Ibyte, qxestrlen (name) + 10);
+  Ibyte *rootname = NULL;  /* default to current volume */
   volume_info_data *info;

   if (name == NULL)
@@ -739,7 +739,7 @@
     }
   else if (IS_DIRECTORY_SEP (name[0]) && IS_DIRECTORY_SEP (name[1]))
     {
-      Intbyte *str = temp;
+      Ibyte *str = temp;
       int slashes = 4;
       rootname = temp;
       do
@@ -772,9 +772,9 @@
    predates Windows 95!) */

 static int
-is_exec (const Intbyte *name)
+is_exec (const Ibyte *name)
 {
-  Intbyte *p = qxestrrchr (name, '.');
+  Ibyte *p = qxestrrchr (name, '.');
   return (p != NULL && (qxestrcasecmp (p, ".exe") == 0 ||
 			qxestrcasecmp (p, ".com") == 0 ||
 			qxestrcasecmp (p, ".bat") == 0 ||
@@ -788,18 +788,18 @@
 struct direct dir_static;       /* simulated directory contents */
 static HANDLE dir_find_handle = INVALID_HANDLE_VALUE;
 /*  dir_is_fat deleted */
-static Intbyte *dir_pathname;
+static Ibyte *dir_pathname;
 static WIN32_FIND_DATAW dir_find_data;

 /* Support shares on a network resource as subdirectories of a read-only
    root directory. */
 static HANDLE wnet_enum_handle = INVALID_HANDLE_VALUE;
-static HANDLE open_unc_volume (const Intbyte *);
-static Intbyte *read_unc_volume (HANDLE);
+static HANDLE open_unc_volume (const Ibyte *);
+static Ibyte *read_unc_volume (HANDLE);
 static int close_unc_volume (HANDLE);

 DIR *
-mswindows_opendir (const Intbyte *filename)
+mswindows_opendir (const Ibyte *filename)
 {
   DIR *dirp;

@@ -852,7 +852,7 @@
 struct direct *
 mswindows_readdir (DIR *dirp)
 {
-  Intbyte *val;
+  Ibyte *val;
   int need_to_free = 0;

   if (wnet_enum_handle != INVALID_HANDLE_VALUE)
@@ -865,7 +865,7 @@
   else if (dir_find_handle == INVALID_HANDLE_VALUE)
     {
       DECLARE_EISTRING (filename);
-      Emchar lastch;
+      Ichar lastch;

       eicpy_rawz (filename, dir_pathname);
       lastch = eigetch_char (filename, eicharlen (filename) - 1);
@@ -916,7 +916,7 @@
 }

 static HANDLE
-open_unc_volume (const Intbyte *path)
+open_unc_volume (const Ibyte *path)
 {
   NETRESOURCEW nr;
   HANDLE henum;
@@ -940,13 +940,13 @@
     return INVALID_HANDLE_VALUE;
 }

-static Intbyte *
+static Ibyte *
 read_unc_volume (HANDLE henum)
 {
   int count;
   int result;
   Extbyte buf[16384];
-  Intbyte *ptr;
+  Ibyte *ptr;
   Bytecount bufsize = sizeof (buf);

   count = 1;
@@ -966,11 +966,11 @@

   /* WNetEnumResource returns \\resource\share...skip forward to "share". */
   TSTR_TO_C_STRING (((LPNETRESOURCEW) buf)->lpRemoteName, ptr);
-  INC_CHARPTR (ptr);
-  INC_CHARPTR (ptr);
-  while (*ptr && !IS_DIRECTORY_SEP (charptr_emchar (ptr)))
-    INC_CHARPTR (ptr);
-  INC_CHARPTR (ptr);
+  INC_IBYTEPTR (ptr);
+  INC_IBYTEPTR (ptr);
+  while (*ptr && !IS_DIRECTORY_SEP (itext_ichar (ptr)))
+    INC_IBYTEPTR (ptr);
+  INC_IBYTEPTR (ptr);

   return qxestrdup (ptr);
 }
@@ -985,7 +985,7 @@
 }

 static DWORD
-unc_volume_file_attributes (const Intbyte *path)
+unc_volume_file_attributes (const Ibyte *path)
 {
   HANDLE henum;
   DWORD attrs;
@@ -1002,7 +1002,7 @@
 }

 int
-mswindows_access (const Intbyte *path, int mode)
+mswindows_access (const Ibyte *path, int mode)
 {
   DWORD attributes;

@@ -1051,7 +1051,7 @@
 /* #### NT 5.0 has a function CreateHardLink to do this directly,
    and it may do more things. */
 int
-mswindows_link (const Intbyte *old, const Intbyte *new)
+mswindows_link (const Ibyte *old, const Ibyte *new)
 {
   HANDLE fileh;
   int result = -1;
@@ -1125,10 +1125,10 @@
 /* sys_open() merged into sysdep.c sys_open() */

 int
-mswindows_rename (const Intbyte *oldname, const Intbyte *newname)
+mswindows_rename (const Ibyte *oldname, const Ibyte *newname)
 {
   int result;
-  Intbyte *temp;
+  Ibyte *temp;

   /* MoveFile on Windows 95 doesn't correctly change the short file name
      alias in a number of circumstances (it is not easy to predict when
@@ -1146,18 +1146,18 @@
   /* XEmacs: We sprintf() part of OLDNAME into part of OLDNAME + a number,
      so the following calculation should certainly be enough. */

-  temp = qxestrcpy (alloca_intbytes (2 * qxestrlen (oldname) + 100), oldname);
+  temp = qxestrcpy (alloca_ibytes (2 * qxestrlen (oldname) + 100), oldname);

   if (mswindows_windows9x_p)
     {
-      Intbyte *o;
-      Intbyte *p;
+      Ibyte *o;
+      Ibyte *p;
       int i = 0;

       if (o = qxestrrchr (oldname, '\\'))
 	o++;
       else
-	o = (Intbyte *) oldname;
+	o = (Ibyte *) oldname;

       if (p = qxestrrchr (temp, '\\'))
 	p++;
@@ -1209,7 +1209,7 @@
 }

 int
-mswindows_unlink (const Intbyte *path)
+mswindows_unlink (const Ibyte *path)
 {
   Extbyte *pathout;

@@ -1429,7 +1429,7 @@
   else
     {
 #if 0 /* no way of knowing the filename */
-      Intbyte *p = qxestrrchr (name, '.');
+      Ibyte *p = qxestrrchr (name, '.');
       if (p != NULL &&
 	  (qxestrcasecmp (p, ".exe") == 0 ||
 	   qxestrcasecmp (p, ".com") == 0 ||
@@ -1448,9 +1448,9 @@
    replace it with our own.  This also allows us to calculate consistent
    inode values without hacks in the main Emacs code. */
 int
-mswindows_stat (const Intbyte *path, struct stat *buf)
+mswindows_stat (const Ibyte *path, struct stat *buf)
 {
-  Intbyte *name, *r;
+  Ibyte *name, *r;
   WIN32_FIND_DATAW wfd;
   HANDLE fh;
   DWORD fake_inode;
@@ -1466,7 +1466,7 @@
       return -1;
     }

-  name = qxestrcpy (alloca_intbytes (qxestrlen (path) + 10), path);
+  name = qxestrcpy (alloca_ibytes (qxestrlen (path) + 10), path);
   errm = SetErrorMode (SEM_FAILCRITICALERRORS
 		       | SEM_NOOPENFILEERRORBOX);

@@ -1510,7 +1510,7 @@
   else if (rootdir)
     {
       if (!IS_DIRECTORY_SEP (name[len-1]))
-	qxestrcat (name, (Intbyte *) "\\");
+	qxestrcat (name, (Ibyte *) "\\");
       C_STRING_TO_TSTR (name, nameext);
       if (qxeGetDriveType (nameext) < 2)
 	{
@@ -1545,7 +1545,7 @@
 	  && qxestrncasecmp_i18n (dir_pathname, name, len) == 0
 	  && IS_DIRECTORY_SEP (name[len])
 	  && qxestrcasecmp_i18n (name + len + 1,
-				 (Intbyte *) dir_static.d_name) == 0)
+				 (Ibyte *) dir_static.d_name) == 0)
 	{
 	  /* This was the last entry returned by readdir.  */
 	  wfd = dir_find_data;
@@ -1739,11 +1739,11 @@
 #endif
 }

-Intbyte *
+Ibyte *
 mswindows_getdcwd (int drivelet)
 {
   Extbyte *cwdext;
-  Intbyte *cwd;
+  Ibyte *cwd;

   if (XEUNICODE_P)
     cwdext = (Extbyte *) _wgetdcwd (drivelet, NULL, 0);
@@ -1760,7 +1760,7 @@
 /*--------------------------------------------------------------------*/

 int
-open_input_file (file_data *p_file, const Intbyte *filename)
+open_input_file (file_data *p_file, const Ibyte *filename)
 {
   /* Synched with FSF 20.6.  We fixed some warnings. */
   HANDLE file;
@@ -1796,7 +1796,7 @@
 }

 int
-open_output_file (file_data *p_file, const Intbyte *filename,
+open_output_file (file_data *p_file, const Ibyte *filename,
 		  unsigned long size)
 {
   /* Synched with FSF 20.6.  We fixed some warnings. */
@@ -1862,12 +1862,12 @@
 #endif

 void
-mswindows_executable_type (const Intbyte *filename, int *is_dos_app,
+mswindows_executable_type (const Ibyte *filename, int *is_dos_app,
 			   int *is_cygnus_app)
 {
   /* Synched with FSF 20.6.  We added MINGW stuff and casts. */
   file_data executable;
-  Intbyte *p;
+  Ibyte *p;

   /* Default values in case we can't tell for sure.  */
   *is_dos_app = FALSE;
@@ -1958,14 +1958,14 @@
 	    {
 	      Extbyte *dllname_ext =
 		(Extbyte *) RVA_TO_PTR (imports->Name, section, executable);
-	      Intbyte *dllname;
+	      Ibyte *dllname;

 	      EXTERNAL_TO_C_STRING (dllname_ext, dllname, Qbinary);

 	      /* The exact name of the cygwin dll has changed with
 		 various releases, but hopefully this will be reasonably
 		 future proof.  */
-	      if (qxestrncasecmp (dllname, (Intbyte *) "cygwin", 6) == 0)
+	      if (qxestrncasecmp (dllname, (Ibyte *) "cygwin", 6) == 0)
 		{
 		  *is_cygnus_app = TRUE;
 		  break;
@@ -2001,7 +2001,7 @@
 {
   Extbyte shortname[MAX_PATH * MAX_XETCHAR_SIZE];
   Extbyte *fileext;
-  Intbyte *shortint;
+  Ibyte *shortint;

   CHECK_STRING (filename);

@@ -2028,7 +2028,7 @@
 */
        (filename))
 {
-  Intbyte *longname, *canon;
+  Ibyte *longname, *canon;
   Lisp_Object ret;

   CHECK_STRING (filename);
@@ -2115,7 +2115,7 @@
   /* determine which drives are fixed, for get_cached_volume_information */
   {
     /* GetDriveType must have trailing backslash. */
-    Intbyte drive[] = "A:\\";
+    Ibyte drive[] = "A:\\";

     /* Loop over all possible drive letters */
     while (*drive <= 'Z')
--- a/src/objects-gtk.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/objects-gtk.c	Wed Jun 05 09:58:45 2002 +0000
@@ -72,7 +72,7 @@
 }

 int
-gtk_parse_nearest_color (struct device *d, GdkColor *color, Intbyte *name,
+gtk_parse_nearest_color (struct device *d, GdkColor *color, Ibyte *name,
 			 Bytecount len, Error_Behavior errb)
 {
   GdkColormap *cmap;
@@ -379,7 +379,7 @@

 static int
 gtk_font_spec_matches_charset (struct device *d, Lisp_Object charset,
-			       const Intbyte *nonreloc, Lisp_Object reloc,
+			       const Ibyte *nonreloc, Lisp_Object reloc,
 			       Bytecount offset, Bytecount length)
 {
   if (UNBOUNDP (charset))
@@ -391,7 +391,7 @@
      */
   if (EQ (charset, Vcharset_ascii))
     {
-      const Intbyte *the_nonreloc = nonreloc;
+      const Ibyte *the_nonreloc = nonreloc;
       int i;
       Bytecount the_length = length;

@@ -403,7 +403,7 @@
 	{
 	  for (i = 0;; i++)
 	    {
-	      const Intbyte *new_nonreloc = (const Intbyte *)
+	      const Ibyte *new_nonreloc = (const Ibyte *)
 		memchr (the_nonreloc, '-', the_length);
 	      if (!new_nonreloc)
 		break;
@@ -499,7 +499,7 @@
   /* #### This code seems awfully bogus -- mrb */
   for (i = 0; i < count; i ++)
     {
-      const Intbyte *intname;
+      const Ibyte *intname;
       Bytecount intlen;

       TO_INTERNAL_FORMAT (C_STRING, names[i], ALLOCA, (intname, intlen),
--- a/src/objects-gtk.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/objects-gtk.h	Wed Jun 05 09:58:45 2002 +0000
@@ -46,7 +46,7 @@

 int allocate_nearest_color (GdkColormap *screen_colormap, GdkVisual *visual,
 							GdkColor *color_def);
-int gtk_parse_nearest_color (struct device *d, GdkColor *color, Intbyte *name,
+int gtk_parse_nearest_color (struct device *d, GdkColor *color, Ibyte *name,
 							 Bytecount len, Error_Behavior errb);

 /*****************************************************************************
--- a/src/objects-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/objects-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -915,7 +915,7 @@
 /************************************************************************/

 static int
-hexval (Intbyte c)
+hexval (Ibyte c)
 {
   /* assumes ASCII and isxdigit (c) */
   if (c >= 'a')
@@ -927,7 +927,7 @@
 }

 COLORREF
-mswindows_string_to_color (const Intbyte *name)
+mswindows_string_to_color (const Ibyte *name)
 {
   int i;

@@ -968,7 +968,7 @@
     {
       unsigned int r, g, b;

-      if (sscanf ((CIntbyte *) name, "rgb:%04x/%04x/%04x", &r, &g, &b) == 3)
+      if (sscanf ((CIbyte *) name, "rgb:%04x/%04x/%04x", &r, &g, &b) == 3)
 	{
 	  int len = qxestrlen (name);
 	  if (len == 18)
@@ -990,8 +990,8 @@
     }
   else if (*name)	/* Can't be an empty string */
     {
-      Intbyte *nospaces = (Intbyte *) ALLOCA (qxestrlen (name) + 1);
-      Intbyte *c = nospaces;
+      Ibyte *nospaces = (Ibyte *) ALLOCA (qxestrlen (name) + 1);
+      Ibyte *c = nospaces;
       while (*name)
 	if (*name != ' ')
 	  *c++ = *name++;
@@ -1032,10 +1032,10 @@
  * the corresponding field in the other pattern is either identical or blank.
  */
 static int
-match_font (Intbyte *pattern1, Intbyte *pattern2,
-	    Intbyte *fontname)
+match_font (Ibyte *pattern1, Ibyte *pattern2,
+	    Ibyte *fontname)
 {
-  Intbyte *c1 = pattern1, *c2 = pattern2, *e1 = 0, *e2 = 0;
+  Ibyte *c1 = pattern1, *c2 = pattern2, *e1 = 0, *e2 = 0;
   int i;

   if (fontname)
@@ -1093,10 +1093,10 @@
 font_enum_callback_2 (ENUMLOGFONTEXW *lpelfe, NEWTEXTMETRICEXW *lpntme,
 		      int FontType, struct font_enum_t *font_enum)
 {
-  Intbyte fontname[MSW_FONTSIZE * 2 * MAX_EMCHAR_LEN]; /* should be enough :)*/
+  Ibyte fontname[MSW_FONTSIZE * 2 * MAX_ICHAR_LEN]; /* should be enough :)*/
   Lisp_Object fontname_lispstr;
   int i;
-  Intbyte *facename;
+  Ibyte *facename;

   /*
    * The enumerated font weights are not to be trusted because:
@@ -1110,7 +1110,7 @@
    * those fonts that do get enumerated with different weights.
    */
   TSTR_TO_C_STRING (lpelfe->elfLogFont.lfFaceName, facename);
-  if (charptr_emchar (facename) == '@')
+  if (itext_ichar (facename) == '@')
     /* This is a font for writing vertically. We ignore it. */
     return 1;

@@ -1321,7 +1321,7 @@
 mswindows_finalize_font_instance (Lisp_Font_Instance *f);

 static HFONT
-create_hfont_from_font_spec (const Intbyte *namestr,
+create_hfont_from_font_spec (const Ibyte *namestr,
 			     HDC hdc,
 			     Lisp_Object name_for_errors,
 			     Lisp_Object device_font_list,
@@ -1330,9 +1330,9 @@
   LOGFONTW logfont;
   int fields, i;
   int pt;
-  Intbyte fontname[LF_FACESIZE], weight[LF_FACESIZE], *style, points[8];
-  Intbyte effects[LF_FACESIZE], charset[LF_FACESIZE];
-  Intbyte *c;
+  Ibyte fontname[LF_FACESIZE], weight[LF_FACESIZE], *style, points[8];
+  Ibyte effects[LF_FACESIZE], charset[LF_FACESIZE];
+  Ibyte *c;
   HFONT hfont;

   /*
@@ -1348,7 +1348,7 @@
    *	Courier New:Bold Italic:10:underline strikeout:western
    */

-  fields = sscanf ((CIntbyte *) namestr, "%31[^:]:%31[^:]:%7[^:]:%31[^:]:%31s",
+  fields = sscanf ((CIbyte *) namestr, "%31[^:]:%31[^:]:%7[^:]:%31[^:]:%31s",
 		   fontname, weight, points, effects, charset);

   /* This function is implemented in a fairly ad-hoc manner.
@@ -1451,7 +1451,7 @@
   logfont.lfStrikeOut = FALSE;
   if (fields >= 4 && effects[0] != '\0')
     {
-      Intbyte *effects2;
+      Ibyte *effects2;

       /* Maybe split effects into effects and effects2 */
       if ((c = qxestrchr (effects, ' ')))
@@ -1552,7 +1552,7 @@
   if (!NILP (device_font_list))
     {
       Lisp_Object fonttail;
-      Intbyte truename[MSW_FONTSIZE];
+      Ibyte truename[MSW_FONTSIZE];

       qxesprintf (truename, "%s:%s:%d:%s:%s", fontname, weight, pt, effects,
 		  charset);
@@ -1592,7 +1592,7 @@
 {
   HFONT hfont, hfont2;
   TEXTMETRICW metrics;
-  Intbyte *namestr = XSTRING_DATA (name);
+  Ibyte *namestr = XSTRING_DATA (name);

   hfont = create_hfont_from_font_spec (namestr, hdc, name, device_font_list,
 				       errb);
@@ -1698,7 +1698,7 @@

   LIST_LOOP (fonttail, font_list)
     {
-      Intbyte fontname[MSW_FONTSIZE];
+      Ibyte fontname[MSW_FONTSIZE];

       if (match_font (XSTRING_DATA (XCAR (fonttail)), XSTRING_DATA (pattern),
 		      fontname))
@@ -1728,8 +1728,8 @@
      with initialize_font_instance(). */

   int nsep = 0;
-  Intbyte *ptr = (Intbyte *) XSTRING_DATA (f->name);
-  Intbyte *name = (Intbyte *) ALLOCA (XSTRING_LENGTH (f->name) + 19);
+  Ibyte *ptr = (Ibyte *) XSTRING_DATA (f->name);
+  Ibyte *name = (Ibyte *) ALLOCA (XSTRING_LENGTH (f->name) + 19);

   qxestrcpy (name, ptr);

@@ -1762,7 +1762,7 @@
 #ifdef MULE

 static int
-mswindows_font_spec_matches_charset_stage_1 (const Intbyte *font_charset,
+mswindows_font_spec_matches_charset_stage_1 (const Ibyte *font_charset,
 					     Lisp_Object charset)
 {
   int i, ms_charset = 0;
@@ -1800,13 +1800,13 @@

 static int
 mswindows_font_spec_matches_charset (struct device *d, Lisp_Object charset,
-				     const Intbyte *nonreloc,
+				     const Ibyte *nonreloc,
 				     Lisp_Object reloc,
 				     Bytecount offset, Bytecount length)
 {
-  const Intbyte *the_nonreloc = nonreloc;
+  const Ibyte *the_nonreloc = nonreloc;
   int i;
-  const Intbyte *c;
+  const Ibyte *c;
   Bytecount the_length = length;

 /* The idea is that, when trying to find a suitable font for a character,
@@ -1831,7 +1831,7 @@
   c = the_nonreloc;
   for (i = 0; i < 4; i++)
     {
-      Intbyte *newc = (Intbyte *) memchr (c, ':', the_length);
+      Ibyte *newc = (Ibyte *) memchr (c, ':', the_length);
       if (!newc)
 	break;
       newc++;
@@ -1910,14 +1910,14 @@
       if (dim == 1)
 	{
 	  for (i = lowlim; i <= highlim; i++)
-	    if ((cp = emchar_to_unicode (make_emchar (charset, i, 0))) >= 0)
+	    if ((cp = ichar_to_unicode (make_ichar (charset, i, 0))) >= 0)
 	      break;
 	}
       else
 	{
 	  for (i = lowlim; i <= highlim; i++)
 	    for (j = lowlim; j <= highlim; j++)
-	      if ((cp = emchar_to_unicode (make_emchar (charset, i, j))) >= 0)
+	      if ((cp = ichar_to_unicode (make_ichar (charset, i, j))) >= 0)
 		break;
 	}
--- a/src/objects-tty.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/objects-tty.c	Wed Jun 05 09:58:45 2002 +0000
@@ -215,7 +215,7 @@
 tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
 			      Lisp_Object device, Error_Behavior errb)
 {
-  Intbyte *str = XSTRING_DATA (name);
+  Ibyte *str = XSTRING_DATA (name);
   Lisp_Object charset = Qnil;

   if (qxestrncmp_c (str, "normal", 6))
@@ -282,10 +282,10 @@

 static int
 tty_font_spec_matches_charset (struct device *d, Lisp_Object charset,
-			       const Intbyte *nonreloc, Lisp_Object reloc,
+			       const Ibyte *nonreloc, Lisp_Object reloc,
 			       Bytecount offset, Bytecount length)
 {
-  const Intbyte *the_nonreloc = nonreloc;
+  const Ibyte *the_nonreloc = nonreloc;

   if (!the_nonreloc)
     the_nonreloc = XSTRING_DATA (reloc);
@@ -294,7 +294,7 @@

   if (UNBOUNDP (charset))
     return !memchr (the_nonreloc, '/', length);
-  the_nonreloc = (const Intbyte *) memchr (the_nonreloc, '/', length);
+  the_nonreloc = (const Ibyte *) memchr (the_nonreloc, '/', length);
   if (!the_nonreloc)
     return 0;
   the_nonreloc++;
@@ -310,7 +310,7 @@
 tty_find_charset_font (Lisp_Object device, Lisp_Object font,
 		       Lisp_Object charset)
 {
-  Intbyte *fontname = XSTRING_DATA (font);
+  Ibyte *fontname = XSTRING_DATA (font);

   if (strchr ((const char *) fontname, '/'))
     {
--- a/src/objects-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/objects-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -813,7 +813,7 @@
     {
       Lisp_Object name, value;
       Atom atom = props [i].name;
-      Intbyte *name_str = 0;
+      Ibyte *name_str = 0;
       Bytecount name_len;
       Extbyte *namestrext = XGetAtomName (dpy, atom);

@@ -883,7 +883,7 @@

 static int
 x_font_spec_matches_charset (struct device *d, Lisp_Object charset,
-			     const Intbyte *nonreloc, Lisp_Object reloc,
+			     const Ibyte *nonreloc, Lisp_Object reloc,
 			     Bytecount offset, Bytecount length)
 {
   if (UNBOUNDP (charset))
@@ -895,7 +895,7 @@
      */
   if (EQ (charset, Vcharset_ascii))
     {
-      const Intbyte *the_nonreloc = nonreloc;
+      const Ibyte *the_nonreloc = nonreloc;
       int i;
       Bytecount the_length = length;

@@ -907,7 +907,7 @@
 	{
 	  for (i = 0;; i++)
 	    {
-	      const Intbyte *new_nonreloc = (const Intbyte *)
+	      const Ibyte *new_nonreloc = (const Ibyte *)
 		memchr (the_nonreloc, '-', the_length);
 	      if (!new_nonreloc)
 		break;
@@ -948,7 +948,7 @@
   /* #### This code seems awfully bogus -- mrb */
   for (i = 0; i < count; i ++)
     {
-      const Intbyte *intname;
+      const Ibyte *intname;
       Bytecount intlen;

       TO_INTERNAL_FORMAT (C_STRING, names[i],
--- a/src/objects.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/objects.c	Wed Jun 05 09:58:45 2002 +0000
@@ -667,7 +667,7 @@

 int
 font_spec_matches_charset (struct device *d, Lisp_Object charset,
-			   const Intbyte *nonreloc, Lisp_Object reloc,
+			   const Ibyte *nonreloc, Lisp_Object reloc,
 			   Bytecount offset, Bytecount length)
 {
   return DEVMETH_OR_GIVEN (d, font_spec_matches_charset,
--- a/src/objects.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/objects.h	Wed Jun 05 09:58:45 2002 +0000
@@ -144,7 +144,7 @@

 #ifdef MULE
 int font_spec_matches_charset (struct device *d, Lisp_Object charset,
-			       const Intbyte *nonreloc,
+			       const Ibyte *nonreloc,
 			       Lisp_Object reloc, Bytecount offset,
 			       Bytecount length);
 #endif
--- a/src/postgresql.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/postgresql.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1794,7 +1794,7 @@
 void
 init_postgresql_from_environment (void)
 {
-  Intbyte *p;
+  Ibyte *p;

 #define FROB(envvar, var)			\
   if ((p = egetenv (envvar)))			\
--- a/src/print.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/print.c	Wed Jun 05 09:58:45 2002 +0000
@@ -116,7 +116,7 @@

 FILE *termscript;	/* Stdio stream being used for copy of all output.  */

-static void write_string_to_alternate_debugging_output (Intbyte *str,
+static void write_string_to_alternate_debugging_output (Ibyte *str,
 							Bytecount len);


@@ -127,7 +127,7 @@

 static void
 write_string_to_stdio_stream (FILE *stream, struct console *con,
-			      const Intbyte *ptr, Bytecount len,
+			      const Ibyte *ptr, Bytecount len,
 			      int must_flush)
 {
   Extbyte *extptr = 0;
@@ -207,15 +207,15 @@
    mswindows_output_console_string().  */

 static void
-std_handle_out_va (FILE *stream, const CIntbyte *fmt, va_list args,
+std_handle_out_va (FILE *stream, const CIbyte *fmt, va_list args,
 		   int debug_output_as_well)
 {
-  Intbyte kludge[8192];
+  Ibyte kludge[8192];
   Bytecount kludgelen;

   if (initialized && !inhibit_non_essential_printing_operations)
     fmt = GETTEXT (fmt);
-  vsprintf ((CIntbyte *) kludge, fmt, args);
+  vsprintf ((CIbyte *) kludge, fmt, args);
   kludgelen = qxestrlen (kludge);

   write_string_to_stdio_stream (stream, 0, kludge, kludgelen, 1);
@@ -236,7 +236,7 @@
    conversion in such cases. */

 void
-stderr_out (const CIntbyte *fmt, ...)
+stderr_out (const CIbyte *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
@@ -248,7 +248,7 @@
    window under MS Windows).  Works like stderr_out(). */

 void
-stdout_out (const CIntbyte *fmt, ...)
+stdout_out (const CIbyte *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
@@ -262,7 +262,7 @@
    Works like stderr_out(). */

 void
-debug_out (const CIntbyte *fmt, ...)
+debug_out (const CIbyte *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
@@ -271,7 +271,7 @@
 }

 DOESNT_RETURN
-fatal (const CIntbyte *fmt, ...)
+fatal (const CIbyte *fmt, ...)
 {
   va_list args;
   va_start (args, fmt);
@@ -302,7 +302,7 @@
 */

 static void
-output_string (Lisp_Object function, const Intbyte *nonreloc,
+output_string (Lisp_Object function, const Ibyte *nonreloc,
 	       Lisp_Object reloc, Bytecount offset, Bytecount len)
 {
   /* This function can GC */
@@ -312,7 +312,7 @@
      other functions that take both a nonreloc and a reloc, or things
      may get confused and an assertion failure in
      fixup_internal_substring() may get triggered. */
-  const Intbyte *newnonreloc = nonreloc;
+  const Ibyte *newnonreloc = nonreloc;
   struct gcpro gcpro1, gcpro2;

   /* Emacs won't print while GCing, but an external debugger might */
@@ -343,7 +343,7 @@
 	     we inhibit GC.  */
 	  if (len < 65536)
 	    {
-	      Intbyte *copied = alloca_array (Intbyte, len);
+	      Ibyte *copied = alloca_array (Ibyte, len);
 	      memcpy (copied, newnonreloc + offset, len);
 	      Lstream_write (XLSTREAM (function), copied, len);
 	    }
@@ -416,7 +416,7 @@
 	{
 	  for (iii = ccoff; iii < cclen + ccoff; iii++)
 	    {
-	      call1 (function, make_char (string_emchar (reloc, iii)));
+	      call1 (function, make_char (string_ichar (reloc, iii)));
 	      if (STRINGP (reloc))
 		newnonreloc = XSTRING_DATA (reloc);
 	    }
@@ -426,7 +426,7 @@
 	  for (iii = ccoff; iii < cclen + ccoff; iii++)
 	    {
 	      call1 (function,
-		     make_char (charptr_emchar_n (newnonreloc, iii)));
+		     make_char (itext_ichar_n (newnonreloc, iii)));
 	    }
 	}
     }
@@ -540,7 +540,7 @@
    canonicalize_printcharfun() (i.e. Qnil means stdout, not
    Vstandard_output, etc.)  */
 void
-write_string_1 (Lisp_Object stream, const Intbyte *str, Bytecount size)
+write_string_1 (Lisp_Object stream, const Ibyte *str, Bytecount size)
 {
   /* This function can GC */
 #ifdef ERROR_CHECK_TEXT
@@ -550,17 +550,17 @@
 }

 void
-write_string (Lisp_Object stream, const Intbyte *str)
+write_string (Lisp_Object stream, const Ibyte *str)
 {
   /* This function can GC */
   write_string_1 (stream, str, qxestrlen (str));
 }

 void
-write_c_string (Lisp_Object stream, const CIntbyte *str)
+write_c_string (Lisp_Object stream, const CIbyte *str)
 {
   /* This function can GC */
-  write_string_1 (stream, (const Intbyte *) str, strlen (str));
+  write_string_1 (stream, (const Ibyte *) str, strlen (str));
 }

 void
@@ -572,10 +572,10 @@
 /* Write a printf-style string to STREAM; see output_string(). */

 void
-write_fmt_string (Lisp_Object stream, const CIntbyte *fmt, ...)
+write_fmt_string (Lisp_Object stream, const CIbyte *fmt, ...)
 {
   va_list va;
-  Intbyte *str;
+  Ibyte *str;
   Bytecount len;
   int count;

@@ -594,12 +594,12 @@
    This would require some rewriting of the doprnt() functions, though. */

 void
-write_fmt_string_lisp (Lisp_Object stream, const CIntbyte *fmt, int nargs, ...)
+write_fmt_string_lisp (Lisp_Object stream, const CIbyte *fmt, int nargs, ...)
 {
   Lisp_Object *args = alloca_array (Lisp_Object, nargs);
   va_list va;
   int i;
-  Intbyte *str;
+  Ibyte *str;
   Bytecount len;
   int count;

@@ -614,12 +614,12 @@
 }

 void
-stderr_out_lisp (const CIntbyte *fmt, int nargs, ...)
+stderr_out_lisp (const CIbyte *fmt, int nargs, ...)
 {
   Lisp_Object *args = alloca_array (Lisp_Object, nargs);
   va_list va;
   int i;
-  Intbyte *str;
+  Ibyte *str;
   Bytecount len;
   int count;

@@ -641,11 +641,11 @@
        (character, stream))
 {
   /* This function can GC */
-  Intbyte str[MAX_EMCHAR_LEN];
+  Ibyte str[MAX_ICHAR_LEN];
   Bytecount len;

   CHECK_CHAR_COERCE_INT (character);
-  len = set_charptr_emchar (str, XCHAR (character));
+  len = set_itext_ichar (str, XCHAR (character));
   output_string (canonicalize_printcharfun (stream), str, Qnil, 0, len);
   return character;
 }
@@ -991,7 +991,7 @@
 void
 float_to_string (char *buf, double data)
 {
-  Intbyte *cp, c;
+  Ibyte *cp, c;
   int width;

   if (NILP (Vfloat_output_format)
@@ -1036,7 +1036,7 @@
      representation of that form not be corrupted by the printer.
    */
   {
-    Intbyte *s = (Intbyte *) buf; /* don't use signed chars here!
+    Ibyte *s = (Ibyte *) buf; /* don't use signed chars here!
 				     isdigit() can't hack them! */
     if (*s == '-') s++;
     for (; *s; s++)
@@ -1313,7 +1313,7 @@
       write_c_string (printcharfun, "\"");
       for (i = 0; i < bcmax; i++)
 	{
-	  Intbyte ch = string_byte (obj, i);
+	  Ibyte ch = string_byte (obj, i);
 	  if (ch == '\"' || ch == '\\'
 	      || (ch == '\n' && print_escape_newlines))
 	    {
@@ -1328,7 +1328,7 @@
 		}
 	      else
 		{
-		  Intbyte temp[2];
+		  Ibyte temp[2];
 		  write_c_string (printcharfun, "\\");
 		  /* This is correct for Mule because the
 		     character is either \ or " */
@@ -1497,7 +1497,7 @@
       {
 	/* God intended that this be #\..., you know. */
 	char buf[16];
-	Emchar ch = XCHAR (obj);
+	Ichar ch = XCHAR (obj);
 	char *p = buf;
 	*p++ = '?';
 	if (ch < 32)
@@ -1546,14 +1546,14 @@
 	else if (ch < 160)
 	  {
 	    *p++ = '\\', *p++ = '^';
-	    p += set_charptr_emchar ((Intbyte *) p, ch + 64);
+	    p += set_itext_ichar ((Ibyte *) p, ch + 64);
 	  }
 	else
 	  {
-	    p += set_charptr_emchar ((Intbyte *) p, ch);
+	    p += set_itext_ichar ((Ibyte *) p, ch);
 	  }

-	output_string (printcharfun, (Intbyte *) buf, Qnil, 0, p - buf);
+	output_string (printcharfun, (Ibyte *) buf, Qnil, 0, p - buf);

 	break;
       }
@@ -1683,7 +1683,7 @@

   /* Does it look like an integer or a float? */
   {
-    Intbyte *data = XSTRING_DATA (name);
+    Ibyte *data = XSTRING_DATA (name);
     Bytecount confusing = 0;

     if (size == 0)
@@ -1764,18 +1764,18 @@
 */
        (character))
 {
-  Intbyte str[MAX_EMCHAR_LEN];
+  Ibyte str[MAX_ICHAR_LEN];
   Bytecount len;

   CHECK_CHAR_COERCE_INT (character);
-  len = set_charptr_emchar (str, XCHAR (character));
+  len = set_itext_ichar (str, XCHAR (character));
   write_string_to_alternate_debugging_output (str, len);

   return character;
 }

 static void
-write_string_to_alternate_debugging_output (Intbyte *str, Bytecount len)
+write_string_to_alternate_debugging_output (Ibyte *str, Bytecount len)
 {
   int extlen;
   const Extbyte *extptr;
@@ -1842,11 +1842,11 @@
 				  print_unbuffered);
   else
     {
-      Intbyte str[MAX_EMCHAR_LEN];
+      Ibyte str[MAX_ICHAR_LEN];
       Bytecount len;

       CHECK_CHAR_COERCE_INT (char_or_string);
-      len = set_charptr_emchar (str, XCHAR (char_or_string));
+      len = set_itext_ichar (str, XCHAR (char_or_string));
       write_string_to_stdio_stream (file, con, str, len, print_unbuffered);
     }
--- a/src/process-nt.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/process-nt.c	Wed Jun 05 09:58:45 2002 +0000
@@ -700,8 +700,8 @@
 int
 mswindows_compare_env (const void *strp1, const void *strp2)
 {
-  const Intbyte *str1 = *(const Intbyte **)strp1,
-    *str2 = *(const Intbyte **)strp2;
+  const Ibyte *str1 = *(const Ibyte **)strp1,
+    *str2 = *(const Ibyte **)strp2;

   while (*str1 && *str2 && *str1 != '=' && *str2 != '=')
     {
@@ -751,7 +751,7 @@
     /* SHGetFileInfo tends to return ERROR_FILE_NOT_FOUND on most
        errors. This leads to bogus error message. */
     DWORD image_type;
-    Intbyte *p = qxestrrchr (XSTRING_DATA (program), '.');
+    Ibyte *p = qxestrrchr (XSTRING_DATA (program), '.');
     if (p != NULL &&
 	(qxestrcasecmp (p, ".exe") == 0 ||
 	 qxestrcasecmp (p, ".com") == 0 ||
@@ -860,9 +860,9 @@
      Vprocess_environment terminated by 2 nuls.  */

   {
-    Intbyte **env;
+    Ibyte **env;
     REGISTER Lisp_Object tem;
-    REGISTER Intbyte **new_env;
+    REGISTER Ibyte **new_env;
     REGISTER int new_length = 0, i;

     for (tem = Vprocess_environment;
@@ -883,7 +883,7 @@
     */

     /* new_length + 1 to include terminating 0.  */
-    env = new_env = alloca_array (Intbyte *, new_length + 1);
+    env = new_env = alloca_array (Ibyte *, new_length + 1);

     /* Copy the Vprocess_environment strings into new_env.  */
     for (tem = Vprocess_environment;
@@ -891,15 +891,15 @@
  	  && STRINGP (XCAR (tem)));
  	 tem = XCDR (tem))
       {
-	Intbyte **ep = env;
-	Intbyte *string = XSTRING_DATA (XCAR (tem));
+	Ibyte **ep = env;
+	Ibyte *string = XSTRING_DATA (XCAR (tem));
 	/* See if this string duplicates any string already in the env.
 	   If so, don't put it in.
 	   When an env var has multiple definitions,
 	   we keep the definition that comes first in process-environment.  */
 	for (; ep != new_env; ep++)
 	  {
-	    Intbyte *p = *ep, *q = string;
+	    Ibyte *p = *ep, *q = string;
 	    while (1)
 	      {
 		if (*q == 0)
@@ -919,7 +919,7 @@

     /* Sort the environment variables */
     new_length = new_env - env;
-    qsort (env, new_length, sizeof (Intbyte *), mswindows_compare_env);
+    qsort (env, new_length, sizeof (Ibyte *), mswindows_compare_env);

     {
       DECLARE_EISTRING (envout);
@@ -943,13 +943,13 @@
        while leaving the real app name as argv[0].  */
     if (is_dos_app)
       {
-	cmdname = (Intbyte *) ALLOCA (PATH_MAX);
+	cmdname = (Ibyte *) ALLOCA (PATH_MAX);
 	if (egetenv ("CMDPROXY"))
 	  qxestrcpy (cmdname, egetenv ("CMDPROXY"));
 	else
 	  {
 	    qxestrcpy (cmdname, XSTRING_DATA (Vinvocation_directory));
-	    qxestrcat (cmdname, (Intbyte *) "cmdproxy.exe");
+	    qxestrcat (cmdname, (Ibyte *) "cmdproxy.exe");
 	  }
       }
 #endif
@@ -1095,7 +1095,7 @@
   /* use a reasonable-sized buffer (somewhere around the size of the
      stream buffer) so as to avoid inundating the stream with blocked
      data. */
-  Intbyte chunkbuf[512];
+  Ibyte chunkbuf[512];
   Bytecount chunklen;

   while (1)
--- a/src/process-unix.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/process-unix.c	Wed Jun 05 09:58:45 2002 +0000
@@ -206,7 +206,7 @@
 #ifndef MAX_PTYNAME_LEN
 #define MAX_PTYNAME_LEN 64
 #endif
-static Intbyte pty_name[MAX_PTYNAME_LEN];
+static Ibyte pty_name[MAX_PTYNAME_LEN];

 /* Open an available pty, returning a file descriptor.
    Return -1 on failure.
@@ -228,8 +228,8 @@
      grovelling code in allocate_pty_the_old_fashioned_way(). */
   int master_fd = -1;
   const Extbyte *slave_name = NULL;
-  const CIntbyte *clone = NULL;
-  static const CIntbyte * const clones[] =
+  const CIbyte *clone = NULL;
+  static const CIbyte * const clones[] =
     /* Different pty master clone devices */
     {
       "/dev/ptmx",      /* Various systems */
@@ -283,7 +283,7 @@
     for (i = 0; i < countof (clones); i++)
       {
 	clone = clones[i];
-	master_fd = qxe_open ((Intbyte *) clone,
+	master_fd = qxe_open ((Ibyte *) clone,
 			      O_RDWR | O_NONBLOCK | OPEN_BINARY, 0);
 	if (master_fd >= 0)
 	  goto have_master;
@@ -311,7 +311,7 @@

  have_slave_name:
   {
-    Intbyte *slaveint;
+    Ibyte *slaveint;

     EXTERNAL_TO_C_STRING (slave_name, slaveint, Qfile_name);
     qxestrncpy (pty_name, slaveint, sizeof (pty_name));
@@ -869,7 +869,7 @@
       int newfd = dup (fd);
       if (newfd == -1)
 	{
-	  Intbyte *errmess;
+	  Ibyte *errmess;
 	  GET_STRERROR (errmess, errno);
 	  stderr_out ("Error while setting up child: %s\n", errmess);
 	  _exit (1);
@@ -894,11 +894,11 @@
    parent.  */

 static void
-child_setup (int in, int out, int err, Intbyte **new_argv,
+child_setup (int in, int out, int err, Ibyte **new_argv,
 	     Lisp_Object current_dir)
 {
-  Intbyte **env;
-  Intbyte *pwd;
+  Ibyte **env;
+  Ibyte *pwd;

 #ifdef SET_EMACS_PRIORITY
   if (emacs_priority != 0)
@@ -921,7 +921,7 @@
     REGISTER Bytecount i;

     i = XSTRING_LENGTH (current_dir);
-    pwd = alloca_array (Intbyte, i + 6);
+    pwd = alloca_array (Ibyte, i + 6);
     memcpy (pwd, "PWD=", 4);
     memcpy (pwd + 4, XSTRING_DATA (current_dir), i);
     i += 4;
@@ -951,10 +951,10 @@

   /* Set `env' to a vector of the strings in Vprocess_environment.  */
   /* + 2 to include PWD and terminating 0.  */
-  env = alloca_array (Intbyte *, XINT (Flength (Vprocess_environment)) + 2);
+  env = alloca_array (Ibyte *, XINT (Flength (Vprocess_environment)) + 2);
   {
     REGISTER Lisp_Object tail;
-    Intbyte **new_env = env;
+    Ibyte **new_env = env;

     /* If we have a PWD envvar and we know the real current directory,
        pass one down, but with corrected value.  */
@@ -966,8 +966,8 @@
 	 CONSP (tail) && STRINGP (XCAR (tail));
 	 tail = XCDR (tail))
       {
-      Intbyte **ep = env;
-      Intbyte *envvar = XSTRING_DATA (XCAR (tail));
+      Ibyte **ep = env;
+      Ibyte *envvar = XSTRING_DATA (XCAR (tail));

       /* See if envvar duplicates any string already in the env.
 	 If so, don't put it in.
@@ -975,7 +975,7 @@
 	 we keep the definition that comes first in process-environment.  */
       for (; ep != new_env; ep++)
 	{
-	  Intbyte *p = *ep, *q = envvar;
+	  Ibyte *p = *ep, *q = envvar;
 	  while (1)
 	    {
 	      if (*q == 0)
@@ -988,7 +988,7 @@
 	      p++, q++;
 	    }
 	}
-      if (pwd && !qxestrncmp ((Intbyte *) "PWD=", envvar, 4))
+      if (pwd && !qxestrncmp ((Ibyte *) "PWD=", envvar, 4))
 	{
 	  *new_env++ = pwd;
 	  pwd = 0;
@@ -1272,7 +1272,7 @@
 	EMACS_SIGNAL (SIGQUIT, SIG_DFL);

 	{
-	  Intbyte **new_argv = alloca_array (Intbyte *, nargv + 2);
+	  Ibyte **new_argv = alloca_array (Ibyte *, nargv + 2);
 	  int i;

 	  /* Nothing below here GCs so our string pointers shouldn't move. */
@@ -1509,7 +1509,7 @@
       /* use a reasonable-sized buffer (somewhere around the size of the
 	 stream buffer) so as to avoid inundating the stream with blocked
 	 data. */
-      Intbyte chunkbuf[512];
+      Ibyte chunkbuf[512];
       Bytecount chunklen;

       while (1)
@@ -1591,10 +1591,10 @@
      character in init_process_io_handles but here it simply screws
      things up. */
 #if 0
-  Intbyte eof_char = get_eof_char (XPROCESS (proc));
+  Ibyte eof_char = get_eof_char (XPROCESS (proc));
   send_process (proc, Qnil, &eof_char, 0, 1);
 #else
-  send_process (proc, Qnil, (const Intbyte *) "\004", 0, 1);
+  send_process (proc, Qnil, (const Ibyte *) "\004", 0, 1);
 #endif
   return 1;
 }
@@ -1732,7 +1732,7 @@
       /* If possible, send signals to the entire pgrp
 	 by sending an input character to it.  */
       {
-        Intbyte sigchar = process_signal_char (d->subtty, signo);
+        Ibyte sigchar = process_signal_char (d->subtty, signo);
         if (sigchar)
 	  {
 	    send_process (proc, Qnil, &sigchar, 0, 1);
@@ -1833,7 +1833,7 @@
   retval = getaddrinfo (ext_host, NULL, &hints, &res);
   if (retval != 0)
     {
-      CIntbyte *gai_err;
+      CIbyte *gai_err;

       EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_err,
 			    Qstrerror_encoding);
@@ -1929,7 +1929,7 @@
     retval = getaddrinfo (ext_host, portstring, &hints, &res);
     if (retval != 0)
       {
-	CIntbyte *gai_err;
+	CIbyte *gai_err;

 	EXTERNAL_TO_C_STRING (gai_strerror (retval), gai_err,
 			      Qstrerror_encoding);
--- a/src/process.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/process.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1052,7 +1052,7 @@
 {
   /* This function can GC */
   Bytecount nbytes, nchars;
-  Intbyte chars[1025];
+  Ibyte chars[1025];
   Lisp_Object outstream;
   Lisp_Process *p = XPROCESS (process);
   Lisp_Object filter = read_stderr ? p->stderr_filter : p->filter;
@@ -1171,7 +1171,7 @@

 void
 send_process (Lisp_Object process,
-              Lisp_Object relocatable, const Intbyte *nonrelocatable,
+              Lisp_Object relocatable, const Ibyte *nonrelocatable,
               int start, int len)
 {
   /* This function can GC */
@@ -1605,7 +1605,7 @@
       else
 	string2 = build_string ("\n");
       set_string_char (string, 0,
-		       DOWNCASE (0, string_emchar (string, 0)));
+		       DOWNCASE (0, string_ichar (string, 0)));
       return concat2 (string, string2);
     }
   else if (EQ (symbol, Qexit))
@@ -1804,7 +1804,7 @@
     return XINT (signal_);
   else
     {
-      Intbyte *name;
+      Ibyte *name;

       CHECK_SYMBOL (signal_);
       name = XSTRING_DATA (XSYMBOL (signal_)->name);
@@ -2278,9 +2278,9 @@


 static int
-getenv_internal (const Intbyte *var,
+getenv_internal (const Ibyte *var,
 		 Bytecount varlen,
-		 Intbyte **value,
+		 Ibyte **value,
 		 Bytecount *valuelen)
 {
   Lisp_Object scan;
@@ -2312,9 +2312,9 @@
 }

 static void
-putenv_internal (const Intbyte *var,
+putenv_internal (const Ibyte *var,
 		 Bytecount varlen,
-		 const Intbyte *value,
+		 const Ibyte *value,
 		 Bytecount valuelen)
 {
   Lisp_Object scan;
@@ -2377,7 +2377,7 @@
 */
        (var, interactivep))
 {
-  Intbyte *value;
+  Ibyte *value;
   Bytecount valuelen;
   Lisp_Object v = Qnil;
   struct gcpro gcpro1;
@@ -2418,23 +2418,23 @@
    WARNING: This value points into Lisp string data and thus will become
    invalid after a GC. */

-Intbyte *
-egetenv (const CIntbyte *var)
+Ibyte *
+egetenv (const CIbyte *var)
 {
   /* This cannot GC -- 7-28-00 ben */
-  Intbyte *value;
+  Ibyte *value;
   Bytecount valuelen;

-  if (getenv_internal ((const Intbyte *) var, strlen (var), &value, &valuelen))
+  if (getenv_internal ((const Ibyte *) var, strlen (var), &value, &valuelen))
     return value;
   else
     return 0;
 }

 void
-eputenv (const CIntbyte *var, const CIntbyte *value)
+eputenv (const CIbyte *var, const CIbyte *value)
 {
-  putenv_internal ((Intbyte *) var, strlen (var), (Intbyte *) value,
+  putenv_internal ((Ibyte *) var, strlen (var), (Ibyte *) value,
 		   strlen (value));
 }

@@ -2469,14 +2469,14 @@
   {
     /* Initialize shell-file-name from environment variables or best guess. */
 #ifdef WIN32_NATIVE
-    const Intbyte *shell = egetenv ("SHELL");
+    const Ibyte *shell = egetenv ("SHELL");
     if (!shell) shell = egetenv ("COMSPEC");
     /* Should never happen! */
     if (!shell) shell =
-      (Intbyte *) (GetVersion () & 0x80000000 ? "command" : "cmd");
+      (Ibyte *) (GetVersion () & 0x80000000 ? "command" : "cmd");
 #else /* not WIN32_NATIVE */
-    const Intbyte *shell = egetenv ("SHELL");
-    if (!shell) shell = (Intbyte *) "/bin/sh";
+    const Ibyte *shell = egetenv ("SHELL");
+    if (!shell) shell = (Ibyte *) "/bin/sh";
 #endif

 #if 0 /* defined (WIN32_NATIVE) */
@@ -2497,7 +2497,7 @@

     if (!egetenv ("SHELL"))
       {
-	Intbyte *faux_var = alloca_array (Intbyte, 7 + qxestrlen (shell));
+	Ibyte *faux_var = alloca_array (Ibyte, 7 + qxestrlen (shell));
 	qxesprintf (faux_var, "SHELL=%s", shell);
 	Vprocess_environment = Fcons (build_intstring (faux_var),
 				      Vprocess_environment);
--- a/src/procimpl.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/procimpl.h	Wed Jun 05 09:58:45 2002 +0000
@@ -183,7 +183,7 @@
 			      void* out, void *err, int flags);
 void send_process (Lisp_Object proc,
 		   Lisp_Object relocatable,
-		   const Intbyte *nonrelocatable,
+		   const Ibyte *nonrelocatable,
 		   int start, int len);

 #endif /* INCLUDED_procimpl_h_ */
--- a/src/realpath.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/realpath.c	Wed Jun 05 09:58:45 2002 +0000
@@ -55,13 +55,13 @@
 #if defined (WIN32_NATIVE)
 /* Length of start of absolute filename. */
 # define ABS_LENGTH(name) (mswindows_abs_start (name))
-static int mswindows_abs_start (const Intbyte *name);
+static int mswindows_abs_start (const Ibyte *name);
 # define readlink_and_correct_case mswindows_readlink_and_correct_case
 #else
 # ifdef CYGWIN
 #  ifdef WIN32_FILENAMES
 #   define ABS_LENGTH(name) (mswindows_abs_start (name))
-static int mswindows_abs_start (const Intbyte * name);
+static int mswindows_abs_start (const Ibyte * name);
 #  else
 #   define ABS_LENGTH(name) (IS_DIRECTORY_SEP (*name) ? \
                              (IS_DIRECTORY_SEP (name[1]) ? 2 : 1) : 0)
@@ -81,14 +81,14 @@
    are lower-cased. Directories must be given without trailing
    '/'. One day, this could read Win2K's reparse points. */
 static int
-mswindows_readlink_and_correct_case (const Intbyte *name, Intbyte *buf,
+mswindows_readlink_and_correct_case (const Ibyte *name, Ibyte *buf,
 				     int size)
 {
   int len = 0;
   int err = 0;
-  const Intbyte *lastname;
+  const Ibyte *lastname;
   int count = 0;
-  const Intbyte *tmp;
+  const Ibyte *tmp;
   DECLARE_EISTRING (result);

   assert (*name);
@@ -155,7 +155,7 @@
 #ifdef CYGWIN
 /* Call readlink and try to find out the correct case for the file. */
 static int
-cygwin_readlink_and_correct_case (const Intbyte *name, Intbyte *buf,
+cygwin_readlink_and_correct_case (const Ibyte *name, Ibyte *buf,
 				  int size)
 {
   int n = qxe_readlink (name, buf, size);
@@ -163,8 +163,8 @@
     {
       /* The file may exist, but isn't a symlink. Try to find the
          right name. */
-      Intbyte *tmp =
-	(Intbyte *) ALLOCA (cygwin_posix_to_win32_path_list_buf_size
+      Ibyte *tmp =
+	(Ibyte *) ALLOCA (cygwin_posix_to_win32_path_list_buf_size
 			    ((char *) name));
       cygwin_posix_to_win32_path_list ((char *) name, (char *) tmp);
       n = mswindows_readlink_and_correct_case (tmp, buf, size);
@@ -179,7 +179,7 @@
 #endif
 /* Length of start of absolute filename. */
 static int
-mswindows_abs_start (const Intbyte *name)
+mswindows_abs_start (const Ibyte *name)
 {
   if (isalpha (*name) && IS_DEVICE_SEP (name[1])
       && IS_DIRECTORY_SEP (name[2]))
@@ -194,15 +194,15 @@
 /* Mule Note: This function works with and returns
    internally-formatted strings. */

-Intbyte *
-qxe_realpath (const Intbyte *path, Intbyte *resolved_path)
+Ibyte *
+qxe_realpath (const Ibyte *path, Ibyte *resolved_path)
 {
-  Intbyte copy_path[PATH_MAX];
-  Intbyte *new_path = resolved_path;
-  Intbyte *max_path;
+  Ibyte copy_path[PATH_MAX];
+  Ibyte *new_path = resolved_path;
+  Ibyte *max_path;
 #if defined (HAVE_READLINK) || defined (WIN32_NATIVE)
   int readlinks = 0;
-  Intbyte link_path[PATH_MAX];
+  Ibyte link_path[PATH_MAX];
   int n;
   int abslen = ABS_LENGTH (path);
 #endif
--- a/src/redisplay-gtk.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay-gtk.c	Wed Jun 05 09:58:45 2002 +0000
@@ -114,7 +114,7 @@
 static int
 separate_textual_runs (unsigned char *text_storage,
 		       struct textual_run *run_storage,
-		       CONST Emchar *str, Charcount len)
+		       CONST Ichar *str, Charcount len)
 {
   Lisp_Object prev_charset = Qunbound; /* not Qnil because that is a
 					  possible valid charset when
@@ -128,13 +128,13 @@

   for (i = 0; i < len; i++)
     {
-      Emchar ch = str[i];
+      Ichar ch = str[i];
       Lisp_Object charset;
       int byte1, byte2;
       int dimension;
       int graphic;

-      BREAKUP_EMCHAR (ch, charset, byte1, byte2);
+      BREAKUP_ICHAR (ch, charset, byte1, byte2);
       dimension = XCHARSET_DIMENSION (charset);
       graphic   = XCHARSET_GRAPHIC   (charset);

@@ -240,7 +240,7 @@
    */

 static int
-gtk_text_width (struct frame *f, struct face_cachel *cachel, CONST Emchar *str,
+gtk_text_width (struct frame *f, struct face_cachel *cachel, CONST Ichar *str,
 		Charcount len)
 {
   int width_so_far = 0;
@@ -296,7 +296,7 @@
 			  int cursor_width, int cursor_height)
 {
   struct frame *f = XFRAME (w->frame);
-  Emchar_dynarr *buf = Dynarr_new (Emchar);
+  Ichar_dynarr *buf = Dynarr_new (Ichar);
   Lisp_Object window;

   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@ -323,7 +323,7 @@
       xpos = rb->xpos;
       width = 0;
       if (rb->type == RUNE_CHAR)
-	charset = emchar_charset (rb->object.chr.ch);
+	charset = ichar_charset (rb->object.chr.ch);
     }

   if (end < 0)
@@ -336,7 +336,7 @@

       if (rb->findex == findex && rb->type == RUNE_CHAR
 	  && rb->object.chr.ch != '\n' && rb->cursor_type != CURSOR_ON
-	  && EQ (charset, emchar_charset (rb->object.chr.ch)))
+	  && EQ (charset, ichar_charset (rb->object.chr.ch)))
 	{
 	  Dynarr_add (buf, rb->object.chr.ch);
 	  width += rb->width;
@@ -359,7 +359,7 @@
 	    {
 	      findex = rb->findex;
 	      xpos = rb->xpos;
-	      charset = emchar_charset (rb->object.chr.ch);
+	      charset = ichar_charset (rb->object.chr.ch);

 	      if (rb->cursor_type == CURSOR_ON)
 		{
@@ -440,7 +440,7 @@
 			 add_glyph_rune(). */
 		      Lisp_Object string =
 			XIMAGE_INSTANCE_TEXT_STRING (instance);
-		      convert_intbyte_string_into_emchar_dynarr
+		      convert_ibyte_string_into_ichar_dynarr
 			(XSTRING_DATA (string), XSTRING_LENGTH (string), buf);

 		      gtk_output_string (w, dl, buf, xpos,
@@ -628,7 +628,7 @@
  DL		Display line that this text is on.  The values in the
  		structure are used to determine the vertical position and
 		clipping range of the text.
- BUF		Dynamic array of Emchars specifying what is actually to be
+ BUF		Dynamic array of Ichars specifying what is actually to be
 		drawn.
  XPOS		X position in pixels where the text should start being drawn.
  XOFFSET	Number of pixels to be chopped off the left side of the
@@ -659,7 +659,7 @@

 void
 gtk_output_string (struct window *w, struct display_line *dl,
-		   Emchar_dynarr *buf, int xpos, int xoffset, int clip_start,
+		   Ichar_dynarr *buf, int xpos, int xoffset, int clip_start,
 		   int width, face_index findex, int cursor,
 		   int cursor_start, int cursor_width, int cursor_height)
 {
--- a/src/redisplay-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -84,7 +84,7 @@

 static int
 separate_textual_runs (textual_run **run_storage_ptr,
-		       const Emchar *str, Charcount len)
+		       const Ichar *str, Charcount len)
 {
   static WCHAR *ext_storage;
   static int ext_storage_size; /* in WCHARS! */
@@ -99,15 +99,15 @@
   if (len == 0)
     return 0;

-  prev_charset = emchar_charset (str[0]);
+  prev_charset = ichar_charset (str[0]);

   for (i = 1; i <= len; i++)
     {
-      if (i == len || !EQ (emchar_charset (str[i]), prev_charset))
+      if (i == len || !EQ (ichar_charset (str[i]), prev_charset))
 	{
 	  int j;
-	  Intbyte *int_storage =
-	    alloca_intbytes (MAX_EMCHAR_LEN * (i - runbegin));
+	  Ibyte *int_storage =
+	    alloca_ibytes (MAX_ICHAR_LEN * (i - runbegin));
 	  int int_storage_ptr = 0;
 	  Extbyte *alloca_ext_storage;
 	  int nchars;
@@ -115,7 +115,7 @@
 	  int_storage_ptr = 0;
 	  for (j = runbegin; j < i; j++)
 	    int_storage_ptr +=
-	      set_charptr_emchar (int_storage + int_storage_ptr, str[j]);
+	      set_itext_ichar (int_storage + int_storage_ptr, str[j]);
 	  TO_EXTERNAL_FORMAT (DATA, (int_storage, int_storage_ptr),
 			      ALLOCA, (alloca_ext_storage, nchars),
 			      Qmswindows_unicode);
@@ -134,7 +134,7 @@
 	  runs_so_far++;
 	  runbegin = i;
 	  if (i < len)
-	    prev_charset = emchar_charset (str[i]);
+	    prev_charset = ichar_charset (str[i]);
 	}
     }

@@ -307,7 +307,7 @@
  ****************************************************************************/
 static void
 mswindows_output_cursor (struct window *w, struct display_line *dl, int xpos,
-			 int width, face_index findex, Emchar ch, int image_p)
+			 int width, face_index findex, Ichar ch, int image_p)
 {
   struct frame *f = XFRAME (w->frame);
   struct device *d = XDEVICE (f->device);
@@ -425,7 +425,7 @@
  DL		Display line that this text is on.  The values in the
  		structure are used to determine the vertical position and
 		clipping range of the text.
- BUF		Dynamic array of Emchars specifying what is actually to be
+ BUF		Dynamic array of Ichars specifying what is actually to be
 		drawn.
  XPOS		X position in pixels where the text should start being drawn.
  XOFFSET	Number of pixels to be chopped off the left side of the
@@ -438,7 +438,7 @@
  ****************************************************************************/
 static void
 mswindows_output_string (struct window *w, struct display_line *dl,
-			 Emchar_dynarr *buf, int xpos, int xoffset, int clip_start,
+			 Ichar_dynarr *buf, int xpos, int xoffset, int clip_start,
 			 int width, face_index findex,
 			 int cursor, int cursor_start, int cursor_width,
 			 int cursor_height)
@@ -1024,7 +1024,7 @@
 				int cursor_width, int cursor_height)
 {
   struct frame *f = XFRAME (w->frame);
-  Emchar_dynarr *buf = Dynarr_new (Emchar);
+  Ichar_dynarr *buf = Dynarr_new (Ichar);
   Lisp_Object window;

   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@ -1047,7 +1047,7 @@
   xpos = rb->xpos;
   width = 0;
   if (rb->type == RUNE_CHAR)
-    charset = emchar_charset (rb->object.chr.ch);
+    charset = ichar_charset (rb->object.chr.ch);

   if (end < 0)
     end = Dynarr_length (rba);
@@ -1059,7 +1059,7 @@

       if (rb->findex == findex && rb->type == RUNE_CHAR
 	  && rb->object.chr.ch != '\n' && rb->cursor_type != CURSOR_ON
-	  && EQ (charset, emchar_charset (rb->object.chr.ch)))
+	  && EQ (charset, ichar_charset (rb->object.chr.ch)))
 	{
 	  Dynarr_add (buf, rb->object.chr.ch);
 	  width += rb->width;
@@ -1081,7 +1081,7 @@
 	    {
 	      findex = rb->findex;
 	      xpos = rb->xpos;
-	      charset = emchar_charset (rb->object.chr.ch);
+	      charset = ichar_charset (rb->object.chr.ch);

 	      if (rb->cursor_type == CURSOR_ON)
 		{
@@ -1290,7 +1290,7 @@
  ****************************************************************************/
 static int
 mswindows_text_width (struct frame *f, struct face_cachel *cachel,
-		      const Emchar *str, Charcount len)
+		      const Ichar *str, Charcount len)
 {
   HDC hdc = get_frame_dc (f, 0);
   int width_so_far = 0;
--- a/src/redisplay-output.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay-output.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1396,7 +1396,7 @@
 {
   Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
   Lisp_Object rest, window = DOMAIN_WINDOW (domain);
-  Emchar_dynarr *buf = Dynarr_new (Emchar);
+  Ichar_dynarr *buf = Dynarr_new (Ichar);
   struct window *w = XWINDOW (window);
   struct device *d = DOMAIN_XDEVICE (domain);
   int layout_height, layout_width;
@@ -1539,12 +1539,12 @@
 			unsigned char charsets[NUM_LEADING_BYTES];
 			struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);

-			find_charsets_in_intbyte_string (charsets,
+			find_charsets_in_ibyte_string (charsets,
 							 XSTRING_DATA (string),
 							 XSTRING_LENGTH (string));
 			ensure_face_cachel_complete (cachel, window, charsets);

-			convert_intbyte_string_into_emchar_dynarr
+			convert_ibyte_string_into_ichar_dynarr
 			  (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);

 			redisplay_normalize_display_box (&cdb, &cdga);
--- a/src/redisplay-tty.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay-tty.c	Wed Jun 05 09:58:45 2002 +0000
@@ -80,14 +80,14 @@
   } while (0)
 #define OUTPUT1_IF(c, a) OUTPUTN_IF (c, a, 1)

-static void tty_output_emchar_dynarr (struct window *w,
+static void tty_output_ichar_dynarr (struct window *w,
 				      struct display_line *dl,
-				      Emchar_dynarr *buf, int xpos,
+				      Ichar_dynarr *buf, int xpos,
 				      face_index findex,
 				      int cursor);
-static void tty_output_intbyte_string (struct window *w,
+static void tty_output_ibyte_string (struct window *w,
 				       struct display_line *dl,
-				       Intbyte *str, Bytecount len,
+				       Ibyte *str, Bytecount len,
 				       int xpos, face_index findex,
 				       int cursor);
 static void tty_turn_on_face (struct window *w, face_index findex);
@@ -103,13 +103,13 @@
  Non-Mule tty's don't have fonts (that we use at least), so everything
  is considered to be fixed width -- in other words, we return LEN.
  Under Mule, however, a character can still cover more than one
- column, so we use emchar_string_displayed_columns().
+ column, so we use ichar_string_displayed_columns().
  ****************************************************************************/
 static int
-tty_text_width (struct frame *f, struct face_cachel *cachel, const Emchar *str,
+tty_text_width (struct frame *f, struct face_cachel *cachel, const Ichar *str,
 		Charcount len)
 {
-  return emchar_string_displayed_columns (str, len);
+  return ichar_string_displayed_columns (str, len);
 }

 /*****************************************************************************
@@ -200,7 +200,7 @@
 			  int cursor_height)
 {
   struct frame *f = XFRAME (w->frame);
-  Emchar_dynarr *buf = Dynarr_new (Emchar);
+  Ichar_dynarr *buf = Dynarr_new (Ichar);

   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
   rune_dynarr *rba = db->runes;
@@ -251,7 +251,7 @@
 	{
 	  if (Dynarr_length (buf))
 	    {
-	      tty_output_emchar_dynarr (w, dl, buf, xpos, findex, 0);
+	      tty_output_ichar_dynarr (w, dl, buf, xpos, findex, 0);
 	      xpos = rb->xpos;
 	    }
 	  Dynarr_reset (buf);
@@ -266,7 +266,7 @@
 		  /* Clear in case a cursor was formerly here. */

 		  Dynarr_add (buf, ' ');
-		  tty_output_emchar_dynarr (w, dl, buf, rb->xpos,
+		  tty_output_ichar_dynarr (w, dl, buf, rb->xpos,
 					    DEFAULT_INDEX, 0);
 		  Dynarr_reset (buf);

@@ -279,7 +279,7 @@
 		  /* There is not a distinct eol cursor on tty's. */

 		  Dynarr_add (buf, rb->object.chr.ch);
-		  tty_output_emchar_dynarr (w, dl, buf, xpos, findex, 0);
+		  tty_output_ichar_dynarr (w, dl, buf, xpos, findex, 0);
 		  Dynarr_reset (buf);

 		  cmgoto (f, dl->ypos - 1, xpos);
@@ -293,7 +293,7 @@
              modeline and this will suffice for that. */
 	  else if (rb->type == RUNE_BLANK || rb->type == RUNE_HLINE)
 	    {
-	      Emchar ch_to_add;
+	      Ichar ch_to_add;
 	      int size = rb->width;

 	      if (rb->type == RUNE_BLANK)
@@ -303,7 +303,7 @@

 	      while (size--)
 		Dynarr_add (buf, ch_to_add);
-	      tty_output_emchar_dynarr (w, dl, buf, rb->xpos, findex, 0);
+	      tty_output_ichar_dynarr (w, dl, buf, rb->xpos, findex, 0);

 	      if (xpos >= cursor_start
 		  && cursor_start < xpos + Dynarr_length (buf))
@@ -364,7 +364,7 @@
     }

   if (Dynarr_length (buf))
-    tty_output_emchar_dynarr (w, dl, buf, xpos, findex, 0);
+    tty_output_ichar_dynarr (w, dl, buf, xpos, findex, 0);
   Dynarr_free (buf);

 }
@@ -520,8 +520,8 @@
 }

 static void
-tty_output_intbyte_string (struct window *w, struct display_line *dl,
-			   Intbyte *str, Bytecount len, int xpos,
+tty_output_ibyte_string (struct window *w, struct display_line *dl,
+			   Ibyte *str, Bytecount len, int xpos,
 			   face_index findex, int cursor)
 {
   struct frame *f = XFRAME (w->frame);
@@ -534,53 +534,53 @@
   tty_turn_on_face (w, findex);

   send_string_to_tty_console (c, str, len);
-  TTY_INC_CURSOR_X (c, intbyte_string_displayed_columns (str, len));
+  TTY_INC_CURSOR_X (c, ibyte_string_displayed_columns (str, len));

   /* Turn the face properties back off. */
   tty_turn_off_face (w, findex);
 }

-static Intbyte_dynarr *tty_output_emchar_dynarr_dynarr;
+static Ibyte_dynarr *tty_output_ichar_dynarr_dynarr;

 /*****************************************************************************
- tty_output_emchar_dynarr
+ tty_output_ichar_dynarr

  Given a string and a starting position, output that string in the
  given face.  If cursor is true, draw a cursor around the string.
  ****************************************************************************/
 static void
-tty_output_emchar_dynarr (struct window *w, struct display_line *dl,
-			  Emchar_dynarr *buf, int xpos, face_index findex,
+tty_output_ichar_dynarr (struct window *w, struct display_line *dl,
+			  Ichar_dynarr *buf, int xpos, face_index findex,
 			  int cursor)
 {
-  if (!tty_output_emchar_dynarr_dynarr)
-    tty_output_emchar_dynarr_dynarr = Dynarr_new (Intbyte);
+  if (!tty_output_ichar_dynarr_dynarr)
+    tty_output_ichar_dynarr_dynarr = Dynarr_new (Ibyte);
   else
-    Dynarr_reset (tty_output_emchar_dynarr_dynarr);
+    Dynarr_reset (tty_output_ichar_dynarr_dynarr);

-  convert_emchar_string_into_intbyte_dynarr (Dynarr_atp (buf, 0),
+  convert_ichar_string_into_ibyte_dynarr (Dynarr_atp (buf, 0),
 					    Dynarr_length (buf),
-					    tty_output_emchar_dynarr_dynarr);
+					    tty_output_ichar_dynarr_dynarr);

-  tty_output_intbyte_string (w, dl,
-			     Dynarr_atp (tty_output_emchar_dynarr_dynarr, 0),
-			     Dynarr_length (tty_output_emchar_dynarr_dynarr),
+  tty_output_ibyte_string (w, dl,
+			     Dynarr_atp (tty_output_ichar_dynarr_dynarr, 0),
+			     Dynarr_length (tty_output_ichar_dynarr_dynarr),
 			     xpos, findex, cursor);
 }

 #if 0

-static Intbyte_dynarr *sidcs_dynarr;
+static Ibyte_dynarr *sidcs_dynarr;

 static void
 substitute_in_dynamic_color_string (Lisp_Object spec, Lisp_Object string)
 {
   int i;
-  Intbyte *specdata = XSTRING_DATA   (spec);
+  Ibyte *specdata = XSTRING_DATA   (spec);
   Bytecount speclen = XSTRING_LENGTH (spec);

   if (!sidcs_dynarr)
-    sidcs_dynarr = Dynarr_new (Intbyte);
+    sidcs_dynarr = Dynarr_new (Ibyte);
   else
     Dynarr_reset (sidcs_dynarr);

@@ -609,7 +609,7 @@
 set_foreground_to (struct console *c, Lisp_Object sym)
 {
   Lisp_Object result;
-  Intbyte *escseq = 0;
+  Ibyte *escseq = 0;
   Bytecount escseqlen = 0;

   result = assq_no_quit (sym, Vtty_color_alist);
@@ -639,7 +639,7 @@
 set_background_to (struct console *c, Lisp_Object sym)
 {
   Lisp_Object result;
-  Intbyte *escseq = 0;
+  Ibyte *escseq = 0;
   Bytecount escseqlen = 0;

   result = assq_no_quit (sym, Vtty_color_alist);
--- a/src/redisplay-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -127,7 +127,7 @@
 static int
 separate_textual_runs (unsigned char *text_storage,
 		       struct textual_run *run_storage,
-		       const Emchar *str, Charcount len)
+		       const Ichar *str, Charcount len)
 {
   Lisp_Object prev_charset = Qunbound; /* not Qnil because that is a
 					  possible valid charset when
@@ -141,13 +141,13 @@

   for (i = 0; i < len; i++)
     {
-      Emchar ch = str[i];
+      Ichar ch = str[i];
       Lisp_Object charset;
       int byte1, byte2;
       int dimension;
       int graphic;

-      BREAKUP_EMCHAR (ch, charset, byte1, byte2);
+      BREAKUP_ICHAR (ch, charset, byte1, byte2);
       dimension = XCHARSET_DIMENSION (charset);
       graphic   = XCHARSET_GRAPHIC   (charset);

@@ -245,7 +245,7 @@
    */

 static int
-x_text_width (struct frame *f, struct face_cachel *cachel, const Emchar *str,
+x_text_width (struct frame *f, struct face_cachel *cachel, const Ichar *str,
 	      Charcount len)
 {
   int width_so_far = 0;
@@ -322,7 +322,7 @@
 			int cursor_width, int cursor_height)
 {
   struct frame *f = XFRAME (w->frame);
-  Emchar_dynarr *buf = Dynarr_new (Emchar);
+  Ichar_dynarr *buf = Dynarr_new (Ichar);
   Lisp_Object window;

   struct display_block *db = Dynarr_atp (dl->display_blocks, block);
@@ -345,7 +345,7 @@
   findex = rb->findex;
   xpos = rb->xpos;
   if (rb->type == RUNE_CHAR)
-    charset = emchar_charset (rb->object.chr.ch);
+    charset = ichar_charset (rb->object.chr.ch);

   if (end < 0)
     end = Dynarr_length (rba);
@@ -357,7 +357,7 @@

       if (rb->findex == findex && rb->type == RUNE_CHAR
 	  && rb->object.chr.ch != '\n' && rb->cursor_type != CURSOR_ON
-	  && EQ (charset, emchar_charset (rb->object.chr.ch)))
+	  && EQ (charset, ichar_charset (rb->object.chr.ch)))
 	{
 	  Dynarr_add (buf, rb->object.chr.ch);
 	  width += rb->width;
@@ -380,7 +380,7 @@
 	    {
 	      findex = rb->findex;
 	      xpos = rb->xpos;
-	      charset = emchar_charset (rb->object.chr.ch);
+	      charset = ichar_charset (rb->object.chr.ch);

 	      if (rb->cursor_type == CURSOR_ON)
 		{
@@ -747,7 +747,7 @@
  DL		Display line that this text is on.  The values in the
  		structure are used to determine the vertical position and
 		clipping range of the text.
- BUF		Dynamic array of Emchars specifying what is actually to be
+ BUF		Dynamic array of Ichars specifying what is actually to be
 		drawn.
  XPOS		X position in pixels where the text should start being drawn.
  XOFFSET	Number of pixels to be chopped off the left side of the
@@ -769,7 +769,7 @@
  ****************************************************************************/
 void
 x_output_string (struct window *w, struct display_line *dl,
-		 Emchar_dynarr *buf, int xpos, int xoffset, int clip_start,
+		 Ichar_dynarr *buf, int xpos, int xoffset, int clip_start,
 		 int width, face_index findex, int cursor,
 		 int cursor_start, int cursor_width, int cursor_height)
 {
--- a/src/redisplay.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay.c	Wed Jun 05 09:58:45 2002 +0000
@@ -82,11 +82,11 @@
 #endif /* HAVE_TTY */

 /* Note: We have to be careful throughout this code to properly handle
-   and differentiate between Intbytes and Emchars.
-
-   Since strings are generally composed of Intbytes, I've taken the tack
-   that any contiguous set of Intbytes is called a "string", while
-   any contiguous set of Emchars is called an "array". */
+   and differentiate between Ibytes and Ichars.
+
+   Since strings are generally composed of Ibytes, I've taken the tack
+   that any contiguous set of Ibytes is called a "string", while
+   any contiguous set of Ichars is called an "array". */

 /* Return value to indicate a failure by an add_*_rune routine to add
    a rune, but no propagation information needs to be returned. */
@@ -118,9 +118,9 @@
   struct device *d;
   struct display_block *db;
   struct display_line *dl;
-  Emchar ch;		/* Character that is to be added.  This is
+  Ichar ch;		/* Character that is to be added.  This is
 			   used to communicate this information to
-			   add_emchar_rune(). */
+			   add_ichar_rune(). */
   Lisp_Object last_charset; /* The charset of the previous character.
 			       Used to optimize some lookups -- we
 			       only have to do some things when
@@ -149,7 +149,7 @@
 			   This is also used rather cheesily to
 			   communicate the width of the eol-cursor-size
 			   blank that exists at the end of the line.
-			   add_emchar_rune() is called cheesily with
+			   add_ichar_rune() is called cheesily with
 			   the non-printing char '\n', which is stuck
 			   in the output routines with its width being
 			   BLANK_WIDTH. */
@@ -217,7 +217,7 @@
 };

 /* Data that should be propagated to the next line.  Either a single
-   Emchar, a string of Intbyte's or a glyph.
+   Ichar, a string of Ibyte's or a glyph.

    The actual data that is propagated ends up as a Dynarr of these
    blocks.
@@ -230,7 +230,7 @@
    instance. Most e-lisp relies on clipping so we preserve this
    behavior.

-   #### It's unclean that both Emchars and Intbytes are here.
+   #### It's unclean that both Ichars and Ibytes are here.
    */

 typedef struct prop_block prop_block;
@@ -242,13 +242,13 @@
   {
     struct
     {
-      Intbyte *str;
+      Ibyte *str;
       Bytecount len; /* length of the string. */
     } p_string;

     struct
     {
-      Emchar ch;
+      Ichar ch;
       Bytebpos byte_cursor_charpos; /* NOTE: is in Bytebpos's */
       unsigned int cursor_type :3;
     } p_char;
@@ -298,7 +298,7 @@
 static void create_right_glyph_block (struct window *w,
 				      struct display_line *dl);
 static void redisplay_windows (Lisp_Object window, int skip_selected);
-static void decode_mode_spec (struct window *w, Emchar spec, int type);
+static void decode_mode_spec (struct window *w, Ichar spec, int type);
 static void free_display_line (struct display_line *dl);
 static void update_line_start_cache (struct window *w, Charbpos from,
 				     Charbpos to, Charbpos point,
@@ -348,7 +348,7 @@

 /* This holds a string representing the text corresponding to a single
    modeline % spec. */
-static Intbyte_dynarr *mode_spec_intbyte_string;
+static Ibyte_dynarr *mode_spec_ibyte_string;

 int in_display;		/* 1 if in redisplay.  */

@@ -519,13 +519,13 @@
 /***************************************************************************/

 static int
-redisplay_text_width_emchar_string (struct window *w, int findex,
-				    Emchar *str, Charcount len)
+redisplay_text_width_ichar_string (struct window *w, int findex,
+				    Ichar *str, Charcount len)
 {
   unsigned char charsets[NUM_LEADING_BYTES];
   Lisp_Object window;

-  find_charsets_in_emchar_string (charsets, str, len);
+  find_charsets_in_ichar_string (charsets, str, len);
   window = wrap_window (w);
   ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
 			       charsets);
@@ -534,51 +534,51 @@
 			       WINDOW_FACE_CACHEL (w, findex), str, len));
 }

-static Emchar_dynarr *rtw_emchar_dynarr;
+static Ichar_dynarr *rtw_ichar_dynarr;

 int
 redisplay_text_width_string (struct window *w, int findex,
-			     Intbyte *nonreloc, Lisp_Object reloc,
+			     Ibyte *nonreloc, Lisp_Object reloc,
 			     Bytecount offset, Bytecount len)
 {
-  if (!rtw_emchar_dynarr)
-    rtw_emchar_dynarr = Dynarr_new (Emchar);
-  Dynarr_reset (rtw_emchar_dynarr);
+  if (!rtw_ichar_dynarr)
+    rtw_ichar_dynarr = Dynarr_new (Ichar);
+  Dynarr_reset (rtw_ichar_dynarr);

   fixup_internal_substring (nonreloc, reloc, offset, &len);
   if (STRINGP (reloc))
     nonreloc = XSTRING_DATA (reloc);
-  convert_intbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
-  return redisplay_text_width_emchar_string
-    (w, findex, Dynarr_atp (rtw_emchar_dynarr, 0),
-     Dynarr_length (rtw_emchar_dynarr));
+  convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
+  return redisplay_text_width_ichar_string
+    (w, findex, Dynarr_atp (rtw_ichar_dynarr, 0),
+     Dynarr_length (rtw_ichar_dynarr));
 }

 int
 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
-				   Intbyte *nonreloc, Lisp_Object reloc,
+				   Ibyte *nonreloc, Lisp_Object reloc,
 				   Bytecount offset, Bytecount len)
 {
   unsigned char charsets[NUM_LEADING_BYTES];
   Lisp_Object frame;
   struct face_cachel cachel;

-  if (!rtw_emchar_dynarr)
-    rtw_emchar_dynarr = Dynarr_new (Emchar);
-  Dynarr_reset (rtw_emchar_dynarr);
+  if (!rtw_ichar_dynarr)
+    rtw_ichar_dynarr = Dynarr_new (Ichar);
+  Dynarr_reset (rtw_ichar_dynarr);

   fixup_internal_substring (nonreloc, reloc, offset, &len);
   if (STRINGP (reloc))
     nonreloc = XSTRING_DATA (reloc);
-  convert_intbyte_string_into_emchar_dynarr (nonreloc, len, rtw_emchar_dynarr);
-  find_charsets_in_intbyte_string (charsets, nonreloc, len);
+  convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
+  find_charsets_in_ibyte_string (charsets, nonreloc, len);
   reset_face_cachel (&cachel);
   cachel.face = face;
   frame = wrap_frame (f);
   ensure_face_cachel_complete (&cachel, frame, charsets);
   return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
-		  text_width, (f, &cachel, Dynarr_atp (rtw_emchar_dynarr, 0),
-			       Dynarr_length (rtw_emchar_dynarr)));
+		  text_width, (f, &cachel, Dynarr_atp (rtw_ichar_dynarr, 0),
+			       Dynarr_length (rtw_ichar_dynarr)));
 }

 /* Return the display block from DL of the given TYPE.  A display line
@@ -750,7 +750,7 @@
    If the baseline is completely blank, or contains no manually positioned
    glyphs, then the textual baseline is simply the baseline of the default font.
    (The `contains no manually positioned glyphs' part is actually done for
-   us by `add_emchar_rune'.)
+   us by `add_ichar_rune'.)

    If the baseline contains pixmaps, and they're all manually positioned, then
    the textual baseline location is constrained that way, and we need do no
@@ -961,10 +961,10 @@
    to fit the rune on the display block (as determined by the MAX_PIXPOS)
    then it adds nothing and returns ADD_FAILED.  If
    NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height
-   to affect the total line height. (See add_intbyte_string_runes()). */
+   to affect the total line height. (See add_ibyte_string_runes()). */

 static prop_block_dynarr *
-add_emchar_rune_1 (pos_data *data, int no_contribute_to_line_height)
+add_ichar_rune_1 (pos_data *data, int no_contribute_to_line_height)
 {
   struct rune rb, *crb;
   int width, local;
@@ -990,7 +990,7 @@
     }
   else
     {
-      Lisp_Object charset = emchar_charset (data->ch);
+      Lisp_Object charset = ichar_charset (data->ch);
       if (!EQ (charset, data->last_charset) ||
 	  data->findex != data->last_findex)
 	{
@@ -1013,10 +1013,10 @@
 	  fi = XFONT_INSTANCE (font_instance);
 	  if (!fi->proportional_p || data->font_is_bogus)
 	    {
-	      Emchar ch = data->font_is_bogus ? '~' : data->ch;
+	      Ichar ch = data->font_is_bogus ? '~' : data->ch;

 	      data->last_char_width =
-		redisplay_text_width_emchar_string (XWINDOW (data->window),
+		redisplay_text_width_ichar_string (XWINDOW (data->window),
 						    data->findex, &ch, 1);
 	    }
 	  else
@@ -1034,7 +1034,7 @@

       width = data->last_char_width;
       if (width < 0) /* proportional fonts */
-	width = redisplay_text_width_emchar_string (XWINDOW (data->window),
+	width = redisplay_text_width_ichar_string (XWINDOW (data->window),
 						    data->findex,
 						    &data->ch, 1);
     }
@@ -1110,12 +1110,12 @@
 }

 static prop_block_dynarr *
-add_emchar_rune (pos_data *data)
-{
-  return add_emchar_rune_1 (data, 0);
-}
-
-/* Given a string C_STRING of length C_LENGTH, call add_emchar_rune for
+add_ichar_rune (pos_data *data)
+{
+  return add_ichar_rune_1 (data, 0);
+}
+
+/* Given a string C_STRING of length C_LENGTH, call add_ichar_rune for
    each character in the string.  Propagate any left-over data unless
    NO_PROP is non-zero.  If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't
    allow this character to increase the total height of the line. (This is
@@ -1124,11 +1124,11 @@
    whether glyph-contrib-p is true.) */

 static prop_block_dynarr *
-add_intbyte_string_runes (pos_data *data, Intbyte *c_string,
+add_ibyte_string_runes (pos_data *data, Ibyte *c_string,
 			  Bytecount c_length, int no_prop,
 			  int no_contribute_to_line_height)
 {
-  Intbyte *pos, *end = c_string + c_length;
+  Ibyte *pos, *end = c_string + c_length;
   prop_block_dynarr *prop;

   /* #### This function is too simplistic.  It needs to do the same
@@ -1139,11 +1139,11 @@

   for (pos = c_string; pos < end;)
     {
-      Intbyte *old_pos = pos;
-
-      data->ch = charptr_emchar (pos);
-
-      prop = add_emchar_rune_1 (data, no_contribute_to_line_height);
+      Ibyte *old_pos = pos;
+
+      data->ch = itext_ichar (pos);
+
+      prop = add_ichar_rune_1 (data, no_contribute_to_line_height);

       if (prop)
 	{
@@ -1156,7 +1156,7 @@
 	      prop = Dynarr_new (prop_block);

 	      pb.type = PROP_STRING;
-	      pb.data.p_string.str = xnew_array (Intbyte, len);
+	      pb.data.p_string.str = xnew_array (Ibyte, len);
 	      strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
 	      pb.data.p_string.len = len;

@@ -1164,7 +1164,7 @@
 	      return prop;
 	    }
 	}
-      INC_CHARPTR (pos);
+      INC_IBYTEPTR (pos);
       assert (pos <= end);
       /* #### Duplicate code from add_string_to_fstring_db_runes
 	 should we do more?*/
@@ -1262,7 +1262,7 @@

 #define ADD_NEXT_OCTAL_RUNE_CHAR do				\
 {								\
-  if (add_failed || (add_failed = add_emchar_rune (data)))	\
+  if (add_failed || (add_failed = add_ichar_rune (data)))	\
     {								\
       struct prop_block pb;					\
       if (!prop)						\
@@ -1279,7 +1279,7 @@
 add_octal_runes (pos_data *data)
 {
   prop_block_dynarr *add_failed, *prop = 0;
-  Emchar orig_char = data->ch;
+  Ichar orig_char = data->ch;
   int orig_cursor_type = data->cursor_type;

   /* Initialize */
@@ -1355,7 +1355,7 @@
   if (!NILP (b->ctl_arrow))
     {
       prop_block_dynarr *prop;
-      Emchar orig_char = data->ch;
+      Ichar orig_char = data->ch;
       int old_cursor_type = data->cursor_type;

       /* Initialize */
@@ -1396,7 +1396,7 @@
 	data->ch = orig_char ^ 0100;
       data->cursor_type = IGNORE_CURSOR;

-      if (add_emchar_rune (data))
+      if (add_ichar_rune (data))
 	{
 	  struct prop_block pb;
 	  if (!prop)
@@ -1424,7 +1424,7 @@

   if (STRINGP (entry))
     {
-      prop = add_intbyte_string_runes (data,
+      prop = add_ibyte_string_runes (data,
 				       XSTRING_DATA   (entry),
 				       XSTRING_LENGTH (entry),
 				       0, 0);
@@ -1450,7 +1450,7 @@
   else if (CHAR_OR_CHAR_INTP (entry))
     {
       data->ch = XCHAR_OR_CHAR_INT (entry);
-      prop = add_emchar_rune (data);
+      prop = add_ichar_rune (data);
     }
   else if (CONSP (entry))
     {
@@ -1460,33 +1460,33 @@
 	{
 	  Lisp_Object format = XCAR (XCDR (entry));
 	  Bytebpos len = XSTRING_LENGTH (format);
-	  Intbyte *src = XSTRING_DATA (format), *end = src + len;
-	  Intbyte *result = alloca_array (Intbyte, len);
-	  Intbyte *dst = result;
+	  Ibyte *src = XSTRING_DATA (format), *end = src + len;
+	  Ibyte *result = alloca_array (Ibyte, len);
+	  Ibyte *dst = result;

 	  while (src < end)
 	    {
-	      Emchar c = charptr_emchar (src);
-	      INC_CHARPTR (src);
+	      Ichar c = itext_ichar (src);
+	      INC_IBYTEPTR (src);
 	      if (c != '%' || src == end)
-		dst += set_charptr_emchar (dst, c);
+		dst += set_itext_ichar (dst, c);
 	      else
 		{
-		  c = charptr_emchar (src);
-		  INC_CHARPTR (src);
+		  c = itext_ichar (src);
+		  INC_IBYTEPTR (src);
 		  switch (c)
 		    {
 		      /*case 'x':
 		      dst += long_to_string_base ((char *)dst, data->ch, 16);
 		      break;*/
 		    case '%':
-		      dst += set_charptr_emchar (dst, '%');
+		      dst += set_itext_ichar (dst, '%');
 		      break;
 		      /* #### unimplemented */
 		    }
 		}
 	    }
-	  prop = add_intbyte_string_runes (data, result, dst - result, 0, 0);
+	  prop = add_ibyte_string_runes (data, result, dst - result, 0, 0);
 	}
     }

@@ -1560,7 +1560,7 @@
 	  data->ch = pb->data.p_char.ch;
 	  data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos;
 	  data->cursor_type = pb->data.p_char.cursor_type;
-	  add_failed = add_emchar_rune (data);
+	  add_failed = add_ichar_rune (data);

 	  if (add_failed)
 	    goto oops_no_more_space;
@@ -1569,7 +1569,7 @@
 	  if (pb->data.p_string.str)
 	    xfree (pb->data.p_string.str);
 	  /* #### bogus bogus -- this doesn't do anything!
-	     Should probably call add_intbyte_string_runes(),
+	     Should probably call add_ibyte_string_runes(),
 	     once that function is fixed. */
 	  break;
 	case PROP_MINIBUF_PROMPT:
@@ -1583,8 +1583,8 @@

 	    while (pb->data.p_string.len > 0)
 	      {
-		data->ch = charptr_emchar (pb->data.p_string.str);
-		add_failed = add_emchar_rune (data);
+		data->ch = itext_ichar (pb->data.p_string.str);
+		add_failed = add_ichar_rune (data);

 		if (add_failed)
 		  {
@@ -1595,8 +1595,8 @@
 		else
 		  {
 		    /* Complicated equivalent of ptr++, len-- */
-		    Intbyte *oldpos = pb->data.p_string.str;
-		    INC_CHARPTR (pb->data.p_string.str);
+		    Ibyte *oldpos = pb->data.p_string.str;
+		    INC_IBYTEPTR (pb->data.p_string.str);
 		    pb->data.p_string.len -= pb->data.p_string.str - oldpos;
 		  }
 	      }
@@ -1873,7 +1873,7 @@
 	  data->byte_start_col_enabled = 0;
 	  if (!allow_cursor)
 	    data->byte_charpos = 0;
-	  add_intbyte_string_runes (data, XSTRING_DATA (string),
+	  add_ibyte_string_runes (data, XSTRING_DATA (string),
 				    XSTRING_LENGTH (string), 0, 1);
 	  data->findex = orig_findex;
 	  data->byte_charpos = orig_charpos;
@@ -2072,7 +2072,7 @@

      Since more than one display table is possible, you have
      great flexibility in mapping ranges of characters.  */
-  Emchar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
+  Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
 			  ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
 			  : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
 			     ? 255 : 160));
@@ -2373,7 +2373,7 @@
 		    }
 		  else {
 		    data.blank_width = DEVMETH (d, eol_cursor_width, ());
-		    add_emchar_rune (&data); /* discard prop data. */
+		    add_ichar_rune (&data); /* discard prop data. */
 		    goto done;
 		  }
 		}
@@ -2436,7 +2436,7 @@
 			 is the EOL cursor width and whose character is
 			 the non-printing character '\n'. */
 		      data.blank_width = DEVMETH (d, eol_cursor_width, ());
-		      *prop = add_emchar_rune (&data);
+		      *prop = add_ichar_rune (&data);
 		    }

 		  /* We need to set data.byte_charpos to the start of the
@@ -2462,7 +2462,7 @@
 	      else
 		{
 		  data.blank_width = DEVMETH (d, eol_cursor_width, ());
-		  *prop = add_emchar_rune (&data);
+		  *prop = add_ichar_rune (&data);
 		}

 	      goto done;
@@ -2527,7 +2527,7 @@
 		  data.start_col_xoffset = 0;
 		  data.byte_start_col_enabled = 0;

-		  add_emchar_rune (&data);
+		  add_ichar_rune (&data);
 		}

 	      /* This had better be a newline but doing it this way
@@ -2542,7 +2542,7 @@
              just add it. */
 	  else if (data.ch >= printable_min)
 	    {
-	      *prop = add_emchar_rune (&data);
+	      *prop = add_ichar_rune (&data);
 	      if (*prop)
 		goto done;
 	    }
@@ -2602,7 +2602,7 @@
 	     often bites people who carelessly use `char' instead
 	     of `unsigned char'.)
 	     */
-	  else if (data.ch < 0x100 && iscntrl ((Intbyte) data.ch))
+	  else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
 	    {
 	      *prop = add_control_char_runes (&data, b);

@@ -2624,7 +2624,7 @@
              then just add it. */
 	  else
 	    {
-	      *prop = add_emchar_rune (&data);
+	      *prop = add_ichar_rune (&data);
 	      if (*prop)
 		goto done;
 	    }
@@ -2685,7 +2685,7 @@
 		  data.ch = '\n';
 		  data.blank_width = DEVMETH (d, eol_cursor_width, ());

-		  add_emchar_rune (&data);
+		  add_ichar_rune (&data);
 		}
 	    }

@@ -2771,7 +2771,7 @@
       data.byte_start_col_enabled = 0;

       data.max_pixpos += data.blank_width;
-      add_emchar_rune (&data);
+      add_ichar_rune (&data);
       data.max_pixpos -= data.blank_width;

       /* #### urk!  Chuck, this shit is bad news.  Going around
@@ -2932,7 +2932,7 @@

   if (STRINGP (Voverlay_arrow_string))
     {
-      add_intbyte_string_runes
+      add_ibyte_string_runes
 	(&data,
 	 XSTRING_DATA   (Voverlay_arrow_string),
 	 XSTRING_LENGTH (Voverlay_arrow_string),
@@ -3771,7 +3771,7 @@
     {
       int elt;
       Bytecount len;
-      Intbyte *strdata;
+      Ibyte *strdata;
       struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));

       in_modeline_generation = 1;
@@ -3787,7 +3787,7 @@
         {
           if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
             {
-              len += (set_charptr_emchar
+              len += (set_itext_ichar
                       (strdata + len, Dynarr_atp (db->runes,
                                                   elt)->object.chr.ch));
             }
@@ -3918,13 +3918,13 @@
 }

 static Charcount
-add_string_to_fstring_db_runes (pos_data *data, const Intbyte *str,
+add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str,
                                 Charcount pos, Charcount min_pos,
 				Charcount max_pos)
 {
   /* This function has been Mule-ized. */
   Charcount end;
-  const Intbyte *cur_pos = str;
+  const Ibyte *cur_pos = str;
   struct display_block *db = data->db;

   data->blank_width = space_width (XWINDOW (data->window));
@@ -3938,12 +3938,12 @@

   while (pos < end && *cur_pos)
     {
-      const Intbyte *old_cur_pos = cur_pos;
+      const Ibyte *old_cur_pos = cur_pos;
       int succeeded;

-      data->ch = charptr_emchar (cur_pos);
-      succeeded = (add_emchar_rune (data) != ADD_FAILED);
-      INC_CHARPTR (cur_pos);
+      data->ch = itext_ichar (cur_pos);
+      succeeded = (add_ichar_rune (data) != ADD_FAILED);
+      INC_IBYTEPTR (cur_pos);
       if (succeeded)
         {
           pos++;
@@ -4029,11 +4029,11 @@
       /* A string.  Add to the display line and check for %-constructs
          within it. */

-      Intbyte *this = XSTRING_DATA (elt);
+      Ibyte *this = XSTRING_DATA (elt);

       while ((pos < max_pos || max_pos == -1) && *this)
         {
-          Intbyte *last = this;
+          Ibyte *last = this;

           while (*this && *this != '%')
             this++;
@@ -4050,7 +4050,7 @@
 		{
 		  Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
 				       min (pos + size - *offset, max_pos));
-		  const Intbyte *tmp_last = charptr_n_addr (last, *offset);
+		  const Ibyte *tmp_last = itext_n_addr (last, *offset);

 		  pos = add_string_to_fstring_db_runes (data, tmp_last,
 							pos, pos, tmp_max);
@@ -4094,7 +4094,7 @@
                     {
                       int cur_pixsize;
                       int dash_pixsize;
-                      Intbyte ch = '-';
+                      Ibyte ch = '-';
                       SET_CURRENT_MODE_CHARS_PIXSIZE;

                       dash_pixsize =
@@ -4107,26 +4107,26 @@

                   while (num_to_add--)
                     pos = add_string_to_fstring_db_runes
-                      (data, (const Intbyte *) "-", pos, pos, max_pos);
+                      (data, (const Ibyte *) "-", pos, pos, max_pos);
                 }
               else if (*this != 0)
                 {
-                  Emchar ch = charptr_emchar (this);
-                  Intbyte *str;
+                  Ichar ch = itext_ichar (this);
+                  Ibyte *str;
 		  Charcount size;

                   decode_mode_spec (w, ch, type);

-                  str = Dynarr_atp (mode_spec_intbyte_string, 0);
+                  str = Dynarr_atp (mode_spec_ibyte_string, 0);
 		  size = bytecount_to_charcount
 		    /* Skip the null character added by `decode_mode_spec' */
-		    (str, Dynarr_length (mode_spec_intbyte_string)) - 1;
+		    (str, Dynarr_length (mode_spec_ibyte_string)) - 1;

 		  if (size <= *offset)
 		    *offset -= size;
 		  else
 		    {
-		      const Intbyte *tmp_str = charptr_n_addr (str, *offset);
+		      const Ibyte *tmp_str = itext_n_addr (str, *offset);

 		      /* #### NOTE: I don't understand why a tmp_max is not
 			 computed and used here as in the plain string case
@@ -4140,7 +4140,7 @@

               /* NOT this++.  There could be any sort of character at
                  the current position. */
-              INC_CHARPTR (this);
+              INC_IBYTEPTR (this);
             }

           if (max_pixsize > 0)
@@ -4165,14 +4165,14 @@
              don't check for % within it.  */
           if (STRINGP (tem))
             {
-	      Intbyte *str = XSTRING_DATA (tem);
+	      Ibyte *str = XSTRING_DATA (tem);
 	      Charcount size = string_char_length (tem);

 	      if (size <= *offset)
 		*offset -= size;
 	      else
 		{
-		  const Intbyte *tmp_str = charptr_n_addr (str, *offset);
+		  const Ibyte *tmp_str = itext_n_addr (str, *offset);

 		  /* #### NOTE: I don't understand why a tmp_max is not
 		     computed and used here as in the plain string case
@@ -4370,8 +4370,8 @@
 	  *offset -= size;
 	else
 	  {
-	    const Intbyte *tmp_str =
-	      charptr_n_addr ((const Intbyte *) str, *offset);
+	    const Ibyte *tmp_str =
+	      itext_n_addr ((const Ibyte *) str, *offset);

 	    /* #### NOTE: I don't understand why a tmp_max is not computed and
 	       used here as in the plain string case above. -- dv */
@@ -4384,7 +4384,7 @@

   if (min_pos > pos)
     {
-      add_string_to_fstring_db_runes (data, (const Intbyte *) "", pos,
+      add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos,
 				      min_pos, -1);
     }

@@ -4573,7 +4573,7 @@

      Since more than one display table is possible, you have
      great flexibility in mapping ranges of characters.  */
-  Emchar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
+  Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
 			  ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
 			  : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
 			     ? 255 : 160)) : 255;
@@ -4792,7 +4792,7 @@
 	 a line are handled correctly. */
       else if (Dynarr_length (data.ef->end_glyphs) > 0)
 	{
-	  data.ch = string_emchar (disp_string, data.byte_charpos);
+	  data.ch = string_ichar (disp_string, data.byte_charpos);
 	  *prop = add_glyph_runes (&data, END_GLYPHS);

 	  if (*prop) {
@@ -4803,7 +4803,7 @@
       /* If there are begin glyphs, add them to the line. */
       else if (Dynarr_length (data.ef->begin_glyphs) > 0)
 	{
-	  data.ch = string_emchar (disp_string, data.byte_charpos);
+	  data.ch = string_ichar (disp_string, data.byte_charpos);
 	  *prop = add_glyph_runes (&data, BEGIN_GLYPHS);

 	  if (*prop) {
@@ -4821,7 +4821,7 @@
 	{
 	  Lisp_Object entry = Qnil;
 	  /* Get the character at the current buffer position. */
-	  data.ch = string_emchar (disp_string, data.byte_charpos);
+	  data.ch = string_ichar (disp_string, data.byte_charpos);
 	  if (!NILP (face_dt) || !NILP (window_dt))
 	    entry = display_table_entry (data.ch, face_dt, window_dt);

@@ -4850,7 +4850,7 @@
              just add it. */
 	  else if (data.ch >= printable_min)
 	    {
-	      *prop = add_emchar_rune (&data);
+	      *prop = add_ichar_rune (&data);
 	      if (*prop)
 		goto done;
 	    }
@@ -4909,7 +4909,7 @@
 	     often bites people who carelessly use `char' instead
 	     of `unsigned char'.)
 	     */
-	  else if (data.ch < 0x100 && iscntrl ((Intbyte) data.ch))
+	  else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
 	    {
 	      *prop = add_control_char_runes (&data, b);

@@ -4931,7 +4931,7 @@
              then just add it. */
 	  else
 	    {
-	      *prop = add_emchar_rune (&data);
+	      *prop = add_ichar_rune (&data);
 	      if (*prop)
 		goto done;
 	    }
@@ -4982,7 +4982,7 @@
 	      Bytecount byte_pos;

 	      /* Now find the start of the next line. */
-	      byte_pos = byte_find_next_emchar_in_string (disp_string, '\n',
+	      byte_pos = byte_find_next_ichar_in_string (disp_string, '\n',
 						      data.byte_charpos, 1);

 	      data.cursor_type = NO_CURSOR;
@@ -5007,10 +5007,10 @@

 	  if (truncate_win && data.byte_charpos == byte_string_zv)
 	    {
-	      const Intbyte *endb = charptr_n_addr (XSTRING_DATA (disp_string),
+	      const Ibyte *endb = itext_n_addr (XSTRING_DATA (disp_string),
 						    byte_string_zv);
-	      DEC_CHARPTR (endb);
-	      if (charptr_emchar (endb) != '\n')
+	      DEC_IBYTEPTR (endb);
+	      if (itext_ichar (endb) != '\n')
 		{
 		  /* #### Damn this losing shit. */
 		  data.byte_charpos++;
@@ -6934,7 +6934,7 @@

 /* Given a character representing an object in a modeline
    specification, return a string (stored into the global array
-   `mode_spec_intbyte_string') with the information that object
+   `mode_spec_ibyte_string') with the information that object
    represents.

    This function is largely unchanged from previous versions of the
@@ -6945,13 +6945,13 @@
 */

 static void
-decode_mode_spec (struct window *w, Emchar spec, int type)
+decode_mode_spec (struct window *w, Ichar spec, int type)
 {
   Lisp_Object obj = Qnil;
   const char *str = NULL;
   struct buffer *b = XBUFFER (w->buffer);

-  Dynarr_reset (mode_spec_intbyte_string);
+  Dynarr_reset (mode_spec_ibyte_string);

   switch (spec)
     {
@@ -6976,8 +6976,8 @@

 	long_to_string (buf, col);

-	Dynarr_add_many (mode_spec_intbyte_string,
-			 (const Intbyte *) buf, strlen (buf));
+	Dynarr_add_many (mode_spec_ibyte_string,
+			 (const Ibyte *) buf, strlen (buf));

 	goto decode_mode_spec_done;
       }
@@ -7110,7 +7110,7 @@
 	    percent = 99;

 	  sprintf (buf, "%d%%", percent);
-	  Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) buf,
+	  Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
 			   strlen (buf));

 	  goto decode_mode_spec_done;
@@ -7161,7 +7161,7 @@
 	  else
 	    sprintf (buf, "%d%%", percent);

-	  Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) buf,
+	  Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
 			   strlen (buf));

 	  goto decode_mode_spec_done;
@@ -7186,7 +7186,7 @@
 	}

       for (i = 0; i < command_loop_level; i++)
-	Dynarr_add (mode_spec_intbyte_string, '[');
+	Dynarr_add (mode_spec_ibyte_string, '[');

       goto decode_mode_spec_done;
     }
@@ -7203,7 +7203,7 @@
 	}

       for (i = 0; i < command_loop_level; i++)
-	Dynarr_add (mode_spec_intbyte_string, ']');
+	Dynarr_add (mode_spec_ibyte_string, ']');

       goto decode_mode_spec_done;
     }
@@ -7215,14 +7215,14 @@
     }

   if (STRINGP (obj))
-    Dynarr_add_many (mode_spec_intbyte_string,
+    Dynarr_add_many (mode_spec_ibyte_string,
 		     XSTRING_DATA   (obj),
 		     XSTRING_LENGTH (obj));
   else if (str)
-    Dynarr_add_many (mode_spec_intbyte_string, (Intbyte *) str, strlen (str));
+    Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str));

 decode_mode_spec_done:
-  Dynarr_add (mode_spec_intbyte_string, '\0');
+  Dynarr_add (mode_spec_ibyte_string, '\0');
 }

 /* Given a display line, free all of its data structures. */
@@ -9406,8 +9406,8 @@
     {
       if (!cmotion_display_lines)
 	cmotion_display_lines = Dynarr_new (display_line);
-      if (!mode_spec_intbyte_string)
-	mode_spec_intbyte_string = Dynarr_new (Intbyte);
+      if (!mode_spec_ibyte_string)
+	mode_spec_ibyte_string = Dynarr_new (Ibyte);
       if (!formatted_string_extent_dynarr)
 	formatted_string_extent_dynarr = Dynarr_new (EXTENT);
       if (!formatted_string_extent_start_dynarr)
--- a/src/redisplay.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/redisplay.h	Wed Jun 05 09:58:45 2002 +0000
@@ -159,7 +159,7 @@
     /* CHAR */
     struct
     {
-      Emchar ch;		/* Character of this rune. */
+      Ichar ch;		/* Character of this rune. */
     } chr;

     /* HLINE */
@@ -683,11 +683,11 @@
 EXFUN (Fredraw_frame, 2);

 int redisplay_text_width_string (struct window *w, int findex,
-				 Intbyte *nonreloc, Lisp_Object reloc,
+				 Ibyte *nonreloc, Lisp_Object reloc,
 				 Bytecount offset, Bytecount len);
 int redisplay_frame_text_width_string (struct frame *f,
 				       Lisp_Object face,
-				       Intbyte *nonreloc,
+				       Ibyte *nonreloc,
 				       Lisp_Object reloc,
 				       Bytecount offset, Bytecount len);
 int redisplay_frame (struct frame *f, int preemption_check);
--- a/src/regex.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/regex.c	Wed Jun 05 09:58:45 2002 +0000
@@ -101,7 +101,7 @@

 #endif /* MULE */

-#define RE_TRANSLATE_1(ch) TRT_TABLE_OF (translate, (Emchar) ch)
+#define RE_TRANSLATE_1(ch) TRT_TABLE_OF (translate, (Ichar) ch)
 #define TRANSLATE_P(tr) (!NILP (tr))

 /* Converts the pointer to the char to BEG-based offset from the start.	 */
@@ -142,9 +142,9 @@

 #include <stdlib.h>

-#define charptr_emchar(str)				((Emchar) (str)[0])
-#define charptr_emchar_fmt(str, fmt, object)		((Emchar) (str)[0])
-#define charptr_emchar_ascii_fmt(str, fmt, object)	((Emchar) (str)[0])
+#define itext_ichar(str)				((Ichar) (str)[0])
+#define itext_ichar_fmt(str, fmt, object)		((Ichar) (str)[0])
+#define itext_ichar_ascii_fmt(str, fmt, object)	((Ichar) (str)[0])

 #if (LONGBITS > INTBITS)
 # define EMACS_INT long
@@ -152,14 +152,14 @@
 # define EMACS_INT int
 #endif

-typedef int Emchar;
-
-#define INC_CHARPTR(p) ((p)++)
-#define INC_CHARPTR_FMT(p, fmt) ((p)++)
-#define DEC_CHARPTR(p) ((p)--)
-#define DEC_CHARPTR_FMT(p, fmt) ((p)--)
-#define charptr_emchar_len(ptr) 1
-#define charptr_emchar_len_fmt(ptr, fmt) 1
+typedef int Ichar;
+
+#define INC_IBYTEPTR(p) ((p)++)
+#define INC_IBYTEPTR_FMT(p, fmt) ((p)++)
+#define DEC_IBYTEPTR(p) ((p)--)
+#define DEC_IBYTEPTR_FMT(p, fmt) ((p)--)
+#define itext_ichar_len(ptr) 1
+#define itext_ichar_len_fmt(ptr, fmt) 1

 #include <string.h>

@@ -1595,12 +1595,12 @@
 #define PATFETCH_RAW(c)							\
   do {if (p == pend) return REG_EEND;					\
     assert (p < pend);							\
-    c = charptr_emchar (p); 						\
-    INC_CHARPTR (p);							\
+    c = itext_ichar (p); 						\
+    INC_IBYTEPTR (p);							\
   } while (0)

 /* Go backwards one character in the pattern.  */
-#define PATUNFETCH DEC_CHARPTR (p)
+#define PATUNFETCH DEC_IBYTEPTR (p)

 /* If `translate' is non-null, return translate[D], else just D.  We
    cast the subscript to translate because some data is declared as
@@ -3185,10 +3185,10 @@
 #else
 	    {
 	      Bytecount bt_count;
-	      Intbyte tmp_buf[MAX_EMCHAR_LEN];
+	      Ibyte tmp_buf[MAX_ICHAR_LEN];
 	      int i;

-	      bt_count = set_charptr_emchar (tmp_buf, c);
+	      bt_count = set_itext_ichar (tmp_buf, c);

 	      for (i = 0; i < bt_count; i++)
 		{
@@ -3402,7 +3402,7 @@
 compile_range (re_char **p_ptr, re_char *pend, RE_TRANSLATE_TYPE translate,
 	       reg_syntax_t syntax, unsigned char *buf_end)
 {
-  Emchar this_char;
+  Ichar this_char;

   re_char *p = *p_ptr;
   int range_start, range_end;
@@ -3448,20 +3448,20 @@
 			RE_TRANSLATE_TYPE translate,
 			reg_syntax_t syntax, Lisp_Object rtab)
 {
-  Emchar this_char, range_start, range_end;
-  const Intbyte *p;
+  Ichar this_char, range_start, range_end;
+  const Ibyte *p;

   if (*p_ptr == pend)
     return REG_ERANGE;

-  p = (const Intbyte *) *p_ptr;
-  range_end = charptr_emchar (p);
+  p = (const Ibyte *) *p_ptr;
+  range_end = itext_ichar (p);
   p--; /* back to '-' */
-  DEC_CHARPTR (p); /* back to start of range */
+  DEC_IBYTEPTR (p); /* back to start of range */
   /* We also want to fetch the endpoints without translating them; the
      appropriate translation is done in the bit-setting loop below.  */
-  range_start = charptr_emchar (p);
-  INC_CHARPTR (*p_ptr);
+  range_start = itext_ichar (p);
+  INC_IBYTEPTR (*p_ptr);

   /* If the start is after the end, the range is empty.  */
   if (range_start > range_end)
@@ -3471,8 +3471,8 @@
      ranges entirely within the first 256 chars. */

   if ((range_start >= 0x100 || range_end >= 0x100)
-      && emchar_leading_byte (range_start) !=
-      emchar_leading_byte (range_end))
+      && ichar_leading_byte (range_start) !=
+      ichar_leading_byte (range_end))
     return REG_ERANGESPAN;

   /* #### This might be way inefficient if the range encompasses 10,000
@@ -3639,7 +3639,7 @@
 		EMACS_INT first, last;
 		Lisp_Object dummy_val;
 		int jj;
-		Intbyte strr[MAX_EMCHAR_LEN];
+		Ibyte strr[MAX_ICHAR_LEN];

 		unified_range_table_get_range (p, i, &first, &last,
 					       &dummy_val);
@@ -3648,11 +3648,11 @@
 		/* Ranges below 0x100 can span charsets, but there
 		   are only two (Control-1 and Latin-1), and
 		   either first or last has to be in them. */
-		set_charptr_emchar (strr, first);
+		set_itext_ichar (strr, first);
 		fastmap[*strr] = 1;
 		if (last < 0x100)
 		  {
-		    set_charptr_emchar (strr, last);
+		    set_itext_ichar (strr, last);
 		    fastmap[*strr] = 1;
 		  }
 	      }
@@ -4102,7 +4102,7 @@
 	{
 	  d = ((const unsigned char *)
 	       (startpos >= size1 ? string2 - size1 : string1) + startpos);
-	  range = charptr_emchar_len_fmt (d, fmt);
+	  range = itext_ichar_len_fmt (d, fmt);
 	}
     }

@@ -4181,25 +4181,25 @@
 	      /* We want to find the next location (including the current
 		 one) where the previous char is a newline, so back up one
 		 and search forward for a newline. */
-	      DEC_CHARPTR_FMT (d, fmt);	/* Ok, since startpos != size1. */
+	      DEC_IBYTEPTR_FMT (d, fmt);	/* Ok, since startpos != size1. */

 	      /* Written out as an if-else to avoid testing `translate'
 		 inside the loop.  */
 	      if (TRANSLATE_P (translate))
 		while (d < stop_d &&
-		       RE_TRANSLATE_1 (charptr_emchar_fmt (d, fmt, lispobj))
+		       RE_TRANSLATE_1 (itext_ichar_fmt (d, fmt, lispobj))
 		       != '\n')
-		  INC_CHARPTR_FMT (d, fmt);
+		  INC_IBYTEPTR_FMT (d, fmt);
 	      else
 		while (d < stop_d &&
-		       charptr_emchar_ascii_fmt (d, fmt, lispobj) != '\n')
-		  INC_CHARPTR_FMT (d, fmt);
+		       itext_ichar_ascii_fmt (d, fmt, lispobj) != '\n')
+		  INC_IBYTEPTR_FMT (d, fmt);

 	      /* If we were stopped by a newline, skip forward over it.
 		 Otherwise we will get in an infloop when our start position
 		 was at begline. */
 	      if (d < stop_d)
-		INC_CHARPTR_FMT (d, fmt);
+		INC_IBYTEPTR_FMT (d, fmt);
 	      range -= d - orig_d;
 	      startpos += d - orig_d;
 #if 1
@@ -4209,12 +4209,12 @@
 	  else if (range < 0)
 	    {
 	      /* We're lazy, like in the fastmap code below */
-	      Emchar c;
+	      Ichar c;

 	      d = ((const unsigned char *)
 		   (startpos >= size1 ? string2 - size1 : string1) + startpos);
-	      DEC_CHARPTR_FMT (d, fmt);
-	      c = charptr_emchar_fmt (d, fmt, lispobj);
+	      DEC_IBYTEPTR_FMT (d, fmt);
+	      c = itext_ichar_fmt (d, fmt, lispobj);
 	      c = RE_TRANSLATE (c);
 	      if (c != '\n')
 		goto advance;
@@ -4261,17 +4261,17 @@
 		    {
 		      re_char *old_d = d;
 #ifdef MULE
-		      Intbyte tempch[MAX_EMCHAR_LEN];
-		      Emchar buf_ch =
-			RE_TRANSLATE_1 (charptr_emchar_fmt (d, fmt, lispobj));
-		      set_charptr_emchar (tempch, buf_ch);
+		      Ibyte tempch[MAX_ICHAR_LEN];
+		      Ichar buf_ch =
+			RE_TRANSLATE_1 (itext_ichar_fmt (d, fmt, lispobj));
+		      set_itext_ichar (tempch, buf_ch);
 		      if (fastmap[*tempch])
 			break;
 #else
 		      if (fastmap[(unsigned char) RE_TRANSLATE_1 (*d)])
 			break;
 #endif /* MULE */
-		      INC_CHARPTR_FMT (d, fmt);
+		      INC_IBYTEPTR_FMT (d, fmt);
 		      range -= (d - old_d);
 #if 1
 		assert (!forward_search_p || range >= 0);
@@ -4284,12 +4284,12 @@
 		  while (range > lim)
 		    {
 		      re_char *old_d = d;
-		      Intbyte tempch[MAX_EMCHAR_LEN];
-		      Emchar buf_ch = charptr_emchar_fmt (d, fmt, lispobj);
-		      set_charptr_emchar (tempch, buf_ch);
+		      Ibyte tempch[MAX_ICHAR_LEN];
+		      Ichar buf_ch = itext_ichar_fmt (d, fmt, lispobj);
+		      set_itext_ichar (tempch, buf_ch);
 		      if (fastmap[*tempch])
 			break;
-		      INC_CHARPTR_FMT (d, fmt);
+		      INC_IBYTEPTR_FMT (d, fmt);
 		      range -= (d - old_d);
 #if 1
 		assert (!forward_search_p || range >= 0);
@@ -4302,7 +4302,7 @@
 		  while (range > lim && !fastmap[*d])
 		    {
 		      re_char *old_d = d;
-		      INC_CHARPTR (d);
+		      INC_IBYTEPTR (d);
 		      range -= (d - old_d);
 #if 1
 		assert (!forward_search_p || range >= 0);
@@ -4321,10 +4321,10 @@
 		   (startpos >= size1 ? string2 - size1 : string1) + startpos);
 #ifdef MULE
 	      {
-		Intbyte tempch[MAX_EMCHAR_LEN];
-		Emchar buf_ch =
-		  RE_TRANSLATE (charptr_emchar_fmt (d, fmt, lispobj));
-		set_charptr_emchar (tempch, buf_ch);
+		Ibyte tempch[MAX_ICHAR_LEN];
+		Ichar buf_ch =
+		  RE_TRANSLATE (itext_ichar_fmt (d, fmt, lispobj));
+		set_itext_ichar (tempch, buf_ch);
 		if (!fastmap[*tempch])
 		  goto advance;
 	      }
@@ -4367,7 +4367,7 @@
 	  Bytecount d_size;
 	  d = ((const unsigned char *)
 	       (startpos >= size1 ? string2 - size1 : string1) + startpos);
-	  d_size = charptr_emchar_len_fmt (d, fmt);
+	  d_size = itext_ichar_len_fmt (d, fmt);
 	  range -= d_size;
 #if 1
 		assert (!forward_search_p || range >= 0);
@@ -4381,8 +4381,8 @@
 	     string1/string2 boundary, we want to backup into string1. */
 	  d = ((const unsigned char *)
 	       (startpos > size1 ? string2 - size1 : string1) + startpos);
-	  DEC_CHARPTR_FMT (d, fmt);
-	  d_size = charptr_emchar_len_fmt (d, fmt);
+	  DEC_IBYTEPTR_FMT (d, fmt);
+	  d_size = itext_ichar_len_fmt (d, fmt);
 	  range += d_size;
 #if 1
 		assert (!forward_search_p || range >= 0);
@@ -4972,13 +4972,13 @@
 		  Bytecount pat_len;

 		  REGEX_PREFETCH ();
-		  if (RE_TRANSLATE_1 (charptr_emchar_fmt (d, fmt, lispobj))
-		      != charptr_emchar (p))
+		  if (RE_TRANSLATE_1 (itext_ichar_fmt (d, fmt, lispobj))
+		      != itext_ichar (p))
                     goto fail;

-		  pat_len = charptr_emchar_len (p);
+		  pat_len = itext_ichar_len (p);
 		  p += pat_len;
-		  INC_CHARPTR_FMT (d, fmt);
+		  INC_IBYTEPTR_FMT (d, fmt);

 		  mcnt -= pat_len;
 #else /* not MULE */
@@ -5003,13 +5003,13 @@
 		      Bytecount pat_len;

 		      REGEX_PREFETCH ();
-		      if (charptr_emchar_fmt (d, fmt, lispobj) !=
-			  charptr_emchar (p))
+		      if (itext_ichar_fmt (d, fmt, lispobj) !=
+			  itext_ichar (p))
 			goto fail;

-		      pat_len = charptr_emchar_len (p);
+		      pat_len = itext_ichar_len (p);
 		      p += pat_len;
-		      INC_CHARPTR_FMT (d, fmt);
+		      INC_IBYTEPTR_FMT (d, fmt);

 		      mcnt -= pat_len;
 		    }
@@ -5038,15 +5038,15 @@
           REGEX_PREFETCH ();

           if ((!(bufp->syntax & RE_DOT_NEWLINE) &&
-	       RE_TRANSLATE (charptr_emchar_fmt (d, fmt, lispobj)) == '\n')
+	       RE_TRANSLATE (itext_ichar_fmt (d, fmt, lispobj)) == '\n')
               || (bufp->syntax & RE_DOT_NOT_NULL &&
-		  RE_TRANSLATE (charptr_emchar_fmt (d, fmt, lispobj)) ==
+		  RE_TRANSLATE (itext_ichar_fmt (d, fmt, lispobj)) ==
 		  '\000'))
 	    goto fail;

           SET_REGS_MATCHED ();
           DEBUG_PRINT2 ("  Matched `%d'.\n", *d);
-	  INC_CHARPTR_FMT (d, fmt); /* XEmacs change */
+	  INC_IBYTEPTR_FMT (d, fmt); /* XEmacs change */
 	  break;


@@ -5059,7 +5059,7 @@
             DEBUG_PRINT2 ("EXECUTING charset%s.\n", not_p ? "_not" : "");

 	    REGEX_PREFETCH ();
-	    c = charptr_emchar_fmt (d, fmt, lispobj);
+	    c = itext_ichar_fmt (d, fmt, lispobj);
 	    c = RE_TRANSLATE (c); /* The character to match.  */

             /* Cast to `unsigned int' instead of `unsigned char' in case the
@@ -5073,7 +5073,7 @@
 	    if (!not_p) goto fail;

 	    SET_REGS_MATCHED ();
-            INC_CHARPTR_FMT (d, fmt); /* XEmacs change */
+            INC_IBYTEPTR_FMT (d, fmt); /* XEmacs change */
 	    break;
 	  }

@@ -5081,13 +5081,13 @@
 	case charset_mule:
 	case charset_mule_not:
 	  {
-	    REGISTER Emchar c;
+	    REGISTER Ichar c;
 	    re_bool not_p = (re_opcode_t) *(p - 1) == charset_mule_not;

             DEBUG_PRINT2 ("EXECUTING charset_mule%s.\n", not_p ? "_not" : "");

 	    REGEX_PREFETCH ();
-	    c = charptr_emchar_fmt (d, fmt, lispobj);
+	    c = itext_ichar_fmt (d, fmt, lispobj);
 	    c = RE_TRANSLATE (c); /* The character to match.  */

 	    if (EQ (Qt, unified_range_table_lookup (p, c, Qnil)))
@@ -5098,7 +5098,7 @@
 	    if (!not_p) goto fail;

 	    SET_REGS_MATCHED ();
-	    INC_CHARPTR_FMT (d, fmt);
+	    INC_IBYTEPTR_FMT (d, fmt);
 	    break;
 	  }
 #endif /* MULE */
@@ -5384,8 +5384,8 @@
           else
 	    {
 	      re_char *d2 = d;
-	      DEC_CHARPTR (d2);
-	      if (charptr_emchar_ascii_fmt (d2, fmt, lispobj) == '\n' &&
+	      DEC_IBYTEPTR (d2);
+	      if (itext_ichar_ascii_fmt (d2, fmt, lispobj) == '\n' &&
 		  bufp->newline_anchor)
 		break;
 	    }
@@ -5404,8 +5404,8 @@

           /* We have to ``prefetch'' the next character.  */
           else if ((d == end1 ?
-		    charptr_emchar_ascii_fmt (string2, fmt, lispobj) :
-		    charptr_emchar_ascii_fmt (d, fmt, lispobj)) == '\n'
+		    itext_ichar_ascii_fmt (string2, fmt, lispobj) :
+		    itext_ichar_ascii_fmt (d, fmt, lispobj)) == '\n'
                    && bufp->newline_anchor)
             {
               break;
@@ -5793,15 +5793,15 @@
 		/* emch1 is the character before d, syn1 is the syntax of
 		   emch1, emch2 is the character at d, and syn2 is the
 		   syntax of emch2. */
-		Emchar emch1, emch2;
+		Ichar emch1, emch2;
 		int syn1, syn2;
 #ifdef emacs
 		Charxpos pos_before;
 #endif

-		DEC_CHARPTR_FMT (d_before, fmt);
-		emch1 = charptr_emchar_fmt (d_before, fmt, lispobj);
-		emch2 = charptr_emchar_fmt (d_after, fmt, lispobj);
+		DEC_IBYTEPTR_FMT (d_before, fmt);
+		emch1 = itext_ichar_fmt (d_before, fmt, lispobj);
+		emch2 = itext_ichar_fmt (d_after, fmt, lispobj);

 #ifdef emacs
 		pos_before =
@@ -5838,7 +5838,7 @@

 	      */
 	    re_char *dtmp = POS_AFTER_GAP_UNSAFE (d);
-	    Emchar emch = charptr_emchar_fmt (dtmp, fmt, lispobj);
+	    Ichar emch = itext_ichar_fmt (dtmp, fmt, lispobj);
 #ifdef emacs
 	    Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d));
 	    UPDATE_SYNTAX_CACHE (scache, charpos);
@@ -5848,8 +5848,8 @@
 	    if (AT_STRINGS_BEG (d))
 	      break;
 	    dtmp = POS_BEFORE_GAP_UNSAFE (d);
-	    DEC_CHARPTR_FMT (dtmp, fmt);
-	    emch = charptr_emchar_fmt (dtmp, fmt, lispobj);
+	    DEC_IBYTEPTR_FMT (dtmp, fmt);
+	    emch = itext_ichar_fmt (dtmp, fmt, lispobj);
 #ifdef emacs
 	    UPDATE_SYNTAX_CACHE_BACKWARD (scache, charpos - 1);
 #endif
@@ -5872,20 +5872,20 @@
 	      The or condition is incorrect (reversed).
 	      */
 	    re_char *dtmp;
-	    Emchar emch;
+	    Ichar emch;
 #ifdef emacs
 	    Charxpos charpos = offset_to_charxpos (lispobj, PTR_TO_OFFSET (d));
 	    UPDATE_SYNTAX_CACHE (scache, charpos);
 #endif
 	    dtmp = POS_BEFORE_GAP_UNSAFE (d);
-	    DEC_CHARPTR_FMT (dtmp, fmt);
-	    emch = charptr_emchar_fmt (dtmp, fmt, lispobj);
+	    DEC_IBYTEPTR_FMT (dtmp, fmt);
+	    emch = itext_ichar_fmt (dtmp, fmt, lispobj);
 	    if (SYNTAX_FROM_CACHE (scache, emch) != Sword)
 	      goto fail;
 	    if (AT_STRINGS_END (d))
 	      break;
 	    dtmp = POS_AFTER_GAP_UNSAFE (d);
-	    emch = charptr_emchar_fmt (dtmp, fmt, lispobj);
+	    emch = itext_ichar_fmt (dtmp, fmt, lispobj);
 #ifdef emacs
 	    UPDATE_SYNTAX_CACHE_FORWARD (scache, charpos + 1);
 #endif
@@ -5932,16 +5932,16 @@
 	matchornotsyntax:
 	  {
 	    int matches;
-	    Emchar emch;
+	    Ichar emch;

 	    REGEX_PREFETCH ();
 	    UPDATE_SYNTAX_CACHE
 	      (scache, offset_to_charxpos (lispobj, PTR_TO_OFFSET (d)));

-	    emch = charptr_emchar_fmt (d, fmt, lispobj);
+	    emch = itext_ichar_fmt (d, fmt, lispobj);
 	    matches = (SYNTAX_FROM_CACHE (scache, emch) ==
 		       (enum syntaxcode) mcnt);
-	    INC_CHARPTR_FMT (d, fmt);
+	    INC_IBYTEPTR_FMT (d, fmt);
 	    if (matches != should_succeed)
 	      goto fail;
 	    SET_REGS_MATCHED ();
@@ -5966,12 +5966,12 @@
 	  should_succeed = 1;
         matchornotcategory:
 	  {
-	    Emchar emch;
+	    Ichar emch;

 	    mcnt = *p++;
 	    REGEX_PREFETCH ();
-	    emch = charptr_emchar_fmt (d, fmt, lispobj);
-	    INC_CHARPTR_FMT (d, fmt);
+	    emch = itext_ichar_fmt (d, fmt, lispobj);
+	    INC_IBYTEPTR_FMT (d, fmt);
 	    if (check_category_char (emch, BUFFER_CATEGORY_TABLE (lispbuf),
 				     mcnt, should_succeed))
 	      goto fail;
@@ -6326,16 +6326,16 @@

   while (p1 != p1_end && p2 != p2_end)
     {
-      Emchar p1_ch, p2_ch;
-
-      p1_ch = charptr_emchar_fmt (p1, fmt, lispobj);
-      p2_ch = charptr_emchar_fmt (p2, fmt, lispobj);
+      Ichar p1_ch, p2_ch;
+
+      p1_ch = itext_ichar_fmt (p1, fmt, lispobj);
+      p2_ch = itext_ichar_fmt (p2, fmt, lispobj);

       if (RE_TRANSLATE_1 (p1_ch)
 	  != RE_TRANSLATE_1 (p2_ch))
 	return 1;
-      INC_CHARPTR_FMT (p1, fmt);
-      INC_CHARPTR_FMT (p2, fmt);
+      INC_IBYTEPTR_FMT (p1, fmt);
+      INC_IBYTEPTR_FMT (p2, fmt);
     }
 #else /* not MULE */
   while (len)
--- a/src/search.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/search.c	Wed Jun 05 09:58:45 2002 +0000
@@ -43,7 +43,7 @@
 #include "chartab.h"

 #define TRANSLATE(table, pos)	\
- (!NILP (table) ? TRT_TABLE_OF (table, (Emchar) pos) : pos)
+ (!NILP (table) ? TRT_TABLE_OF (table, (Ichar) pos) : pos)

 #define REGEXP_CACHE_SIZE 20

@@ -112,10 +112,10 @@

 static void set_search_regs (struct buffer *buf, Charbpos beg, Charcount len);
 static void save_search_regs (void);
-static Charbpos simple_search (struct buffer *buf, Intbyte *base_pat,
+static Charbpos simple_search (struct buffer *buf, Ibyte *base_pat,
 			       Bytecount len, Bytebpos pos, Bytebpos lim,
 			       EMACS_INT n, Lisp_Object trt);
-static Charbpos boyer_moore (struct buffer *buf, Intbyte *base_pat,
+static Charbpos boyer_moore (struct buffer *buf, Ibyte *base_pat,
 			     Bytecount len, Bytebpos pos, Bytebpos lim,
 			     EMACS_INT n, Lisp_Object trt,
 			     Lisp_Object inverse_trt, int charset_base);
@@ -271,7 +271,7 @@
   int num_regs = search_regs.num_regs;

   /* #### bytecount_to_charcount() is not that efficient.  This function
-     could be faster if it did its own conversion (using INC_CHARPTR()
+     could be faster if it did its own conversion (using INC_IBYTEPTR()
      and such), because the register ends are likely to be somewhat ordered.
      (Even if not, you could sort them.)

@@ -496,13 +496,13 @@
    This does not clobber the match data. */

 Bytecount
-fast_string_match (Lisp_Object regexp,  const Intbyte *nonreloc,
+fast_string_match (Lisp_Object regexp,  const Ibyte *nonreloc,
 		   Lisp_Object reloc, Bytecount offset,
 		   Bytecount length, int case_fold_search,
 		   Error_Behavior errb, int no_quit)
 {
   Bytecount val;
-  Intbyte *newnonreloc = (Intbyte *) nonreloc;
+  Ibyte *newnonreloc = (Ibyte *) nonreloc;
   struct re_pattern_buffer *bufp;
   struct syntax_cache scache_struct;
   struct syntax_cache *scache = &scache_struct;
@@ -598,7 +598,7 @@
    If ALLOW_QUIT is non-zero, call QUIT periodically. */

 static Bytebpos
-byte_scan_buffer (struct buffer *buf, Emchar target, Bytebpos st, Bytebpos en,
+byte_scan_buffer (struct buffer *buf, Ichar target, Bytebpos st, Bytebpos en,
 		EMACS_INT count, EMACS_INT *shortage, int allow_quit)
 {
   Bytebpos lim = en > 0 ? en :
@@ -616,7 +616,7 @@
       Internal_Format fmt = buf->text->format;
       /* Check for char that's unrepresentable in the buffer -- it
          certainly can't be there. */
-      if (!emchar_fits_in_format (target, fmt, wrap_buffer (buf)))
+      if (!ichar_fits_in_format (target, fmt, wrap_buffer (buf)))
 	{
 	  *shortage = count;
 	  return lim;
@@ -627,9 +627,9 @@
 	 we do it the "hard" way.  Note that this way works for all
 	 characters and all formats, but the other way is faster. */
       else if (! (fmt == FORMAT_8_BIT_FIXED ||
-		  (fmt == FORMAT_DEFAULT && emchar_ascii_p (target))))
+		  (fmt == FORMAT_DEFAULT && ichar_ascii_p (target))))
 	{
-	  Raw_Emchar raw = emchar_to_raw (target, fmt, wrap_buffer (buf));
+	  Raw_Ichar raw = ichar_to_raw (target, fmt, wrap_buffer (buf));
 	  while (st < lim && count > 0)
 	    {
 	      if (BYTE_BUF_FETCH_CHAR_RAW (buf, st) == raw)
@@ -640,15 +640,15 @@
       else
 #endif
 	{
-	  Raw_Emchar raw = emchar_to_raw (target, fmt, wrap_buffer (buf));
+	  Raw_Ichar raw = ichar_to_raw (target, fmt, wrap_buffer (buf));
 	  while (st < lim && count > 0)
 	    {
 	      Bytebpos ceil;
-	      Intbyte *bufptr;
+	      Ibyte *bufptr;

 	      ceil = BYTE_BUF_CEILING_OF (buf, st);
 	      ceil = min (lim, ceil);
-	      bufptr = (Intbyte *) memchr (BYTE_BUF_BYTE_ADDRESS (buf, st),
+	      bufptr = (Ibyte *) memchr (BYTE_BUF_BYTE_ADDRESS (buf, st),
 					   raw, ceil - st);
 	      if (bufptr)
 		{
@@ -672,15 +672,15 @@
       Internal_Format fmt = buf->text->format;
       /* Check for char that's unrepresentable in the buffer -- it
          certainly can't be there. */
-      if (!emchar_fits_in_format (target, fmt, wrap_buffer (buf)))
+      if (!ichar_fits_in_format (target, fmt, wrap_buffer (buf)))
 	{
 	  *shortage = -count;
 	  return lim;
 	}
       else if (! (fmt == FORMAT_8_BIT_FIXED ||
-		  (fmt == FORMAT_DEFAULT && emchar_ascii_p (target))))
+		  (fmt == FORMAT_DEFAULT && ichar_ascii_p (target))))
 	{
-	  Raw_Emchar raw = emchar_to_raw (target, fmt, wrap_buffer (buf));
+	  Raw_Ichar raw = ichar_to_raw (target, fmt, wrap_buffer (buf));
 	  while (st > lim && count < 0)
 	    {
 	      DEC_BYTEBPOS (buf, st);
@@ -691,12 +691,12 @@
       else
 #endif
 	{
-	  Raw_Emchar raw = emchar_to_raw (target, fmt, wrap_buffer (buf));
+	  Raw_Ichar raw = ichar_to_raw (target, fmt, wrap_buffer (buf));
 	  while (st > lim && count < 0)
 	    {
 	      Bytebpos floor;
-	      Intbyte *bufptr;
-	      Intbyte *floorptr;
+	      Ibyte *bufptr;
+	      Ibyte *floorptr;

 	      floor = BYTE_BUF_FLOOR_OF (buf, st);
 	      floor = max (lim, floor);
@@ -709,7 +709,7 @@
 		  /* At this point, both ST and BUFPTR refer to the same
 		     character.  When the loop terminates, ST will
 		     always point to the last character we tried. */
-		  if (*bufptr == (Intbyte) raw)
+		  if (*bufptr == (Ibyte) raw)
 		    {
 		      count++;
 		      break;
@@ -737,7 +737,7 @@
 }

 Charbpos
-scan_buffer (struct buffer *buf, Emchar target, Charbpos start, Charbpos end,
+scan_buffer (struct buffer *buf, Ichar target, Charbpos start, Charbpos end,
 	     EMACS_INT count, EMACS_INT *shortage, int allow_quit)
 {
   Bytebpos byte_retval;
@@ -772,11 +772,11 @@
 }

 Bytecount
-byte_find_next_emchar_in_string (Lisp_Object str, Emchar target, Bytecount st,
+byte_find_next_ichar_in_string (Lisp_Object str, Ichar target, Bytecount st,
 			       EMACS_INT count)
 {
   Bytebpos lim = XSTRING_LENGTH (str) -1;
-  Intbyte *s = XSTRING_DATA (str);
+  Ibyte *s = XSTRING_DATA (str);

   assert (count >= 0);

@@ -790,7 +790,7 @@
     {
       while (st < lim && count > 0)
 	{
-	  if (string_emchar (str, st) == target)
+	  if (string_ichar (str, st) == target)
 	    count--;
 	  INC_BYTECOUNT (s, st);
 	}
@@ -800,7 +800,7 @@
     {
       while (st < lim && count > 0)
 	{
-	  Intbyte *bufptr = (Intbyte *) memchr (charptr_n_addr (s, st),
+	  Ibyte *bufptr = (Ibyte *) memchr (itext_n_addr (s, st),
 						(int) target, lim - st);
 	  if (bufptr)
 	    {
@@ -834,8 +834,8 @@
 skip_chars (struct buffer *buf, int forwardp, int syntaxp,
 	    Lisp_Object string, Lisp_Object lim)
 {
-  REGISTER Intbyte *p, *pend;
-  REGISTER Emchar c;
+  REGISTER Ibyte *p, *pend;
+  REGISTER Ichar c;
   /* We store the first 256 chars in an array here and the rest in
      a range table. */
   unsigned char fastmap[0400];
@@ -875,8 +875,8 @@

   while (p != pend)
     {
-      c = charptr_emchar (p);
-      INC_CHARPTR (p);
+      c = itext_ichar (p);
+      INC_IBYTEPTR (p);
       if (syntaxp)
 	{
 	  if (c < 0400 && syntax_spec_code[c] < (unsigned char) Smax)
@@ -889,16 +889,16 @@
 	  if (c == '\\')
 	    {
 	      if (p == pend) break;
-	      c = charptr_emchar (p);
-	      INC_CHARPTR (p);
+	      c = itext_ichar (p);
+	      INC_IBYTEPTR (p);
 	    }
 	  if (p != pend && *p == '-')
 	    {
-	      Emchar cend;
+	      Ichar cend;

 	      p++;
 	      if (p == pend) break;
-	      cend = charptr_emchar (p);
+	      cend = itext_ichar (p);
 	      while (c <= cend && c < 0400)
 		{
 		  fastmap[c] = 1;
@@ -907,7 +907,7 @@
 	      if (c <= cend)
 		Fput_range_table (make_int (c), make_int (cend), Qt,
 				  Vskip_chars_range_table);
-	      INC_CHARPTR (p);
+	      INC_IBYTEPTR (p);
 	    }
 	  else
 	    {
@@ -972,7 +972,7 @@
 	  {
 	    while (BUF_PT (buf) < limit)
 	      {
-		Emchar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf));
+		Ichar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf));
 		if ((ch < 0400) ? fastmap[ch] :
 		    (NILP (Fget_range_table (make_int (ch),
 					     Vskip_chars_range_table,
@@ -987,7 +987,7 @@
 	  {
 	    while (BUF_PT (buf) > limit)
 	      {
-		Emchar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf) - 1);
+		Ichar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf) - 1);
 		if ((ch < 0400) ? fastmap[ch] :
 		    (NILP (Fget_range_table (make_int (ch),
 					     Vskip_chars_range_table,
@@ -1135,7 +1135,7 @@
 trivial_regexp_p (Lisp_Object regexp)
 {
   Bytecount len = XSTRING_LENGTH (regexp);
-  Intbyte *s = XSTRING_DATA (regexp);
+  Ibyte *s = XSTRING_DATA (regexp);
   while (--len >= 0)
     {
       switch (*s++)
@@ -1185,7 +1185,7 @@
 	       Lisp_Object inverse_trt, int posix)
 {
   Bytecount len = XSTRING_LENGTH (string);
-  Intbyte *base_pat = XSTRING_DATA (string);
+  Ibyte *base_pat = XSTRING_DATA (string);
   REGISTER EMACS_INT i, j;
   Bytebpos p1, p2;
   Bytecount s1, s2;
@@ -1278,15 +1278,15 @@
     {
       int charset_base = -1;
       int boyer_moore_ok = 1;
-      Intbyte *pat = 0;
-      Intbyte *patbuf = alloca_array (Intbyte, len * MAX_EMCHAR_LEN);
+      Ibyte *pat = 0;
+      Ibyte *patbuf = alloca_array (Ibyte, len * MAX_ICHAR_LEN);
       pat = patbuf;
 #ifdef MULE
       /* &&#### needs some 8-bit work here */
       while (len > 0)
 	{
-	  Intbyte tmp_str[MAX_EMCHAR_LEN];
-	  Emchar c, translated, inverse;
+	  Ibyte tmp_str[MAX_ICHAR_LEN];
+	  Ichar c, translated, inverse;
 	  Bytecount orig_bytelen, new_bytelen, inv_bytelen;

 	  /* If we got here and the RE flag is set, it's because
@@ -1297,13 +1297,13 @@
 	      len--;
 	      base_pat++;
 	    }
-	  c = charptr_emchar (base_pat);
+	  c = itext_ichar (base_pat);
 	  translated = TRANSLATE (trt, c);
 	  inverse = TRANSLATE (inverse_trt, c);

-	  orig_bytelen = charptr_emchar_len (base_pat);
-	  inv_bytelen = set_charptr_emchar (tmp_str, inverse);
-	  new_bytelen = set_charptr_emchar (tmp_str, translated);
+	  orig_bytelen = itext_ichar_len (base_pat);
+	  inv_bytelen = set_itext_ichar (tmp_str, inverse);
+	  new_bytelen = set_itext_ichar (tmp_str, translated);

 	  if (new_bytelen != orig_bytelen || inv_bytelen != orig_bytelen)
 	    boyer_moore_ok = 0;
@@ -1311,7 +1311,7 @@
 	    {
 	      /* Keep track of which character set row
 		 contains the characters that need translation.  */
-	      int charset_base_code = c & ~EMCHAR_FIELD3_MASK;
+	      int charset_base_code = c & ~ICHAR_FIELD3_MASK;
 	      if (charset_base == -1)
 		charset_base = charset_base_code;
 	      else if (charset_base != charset_base_code)
@@ -1360,7 +1360,7 @@
    boyer_moore cannot work.  */

 static Charbpos
-simple_search (struct buffer *buf, Intbyte *base_pat, Bytecount len,
+simple_search (struct buffer *buf, Ibyte *base_pat, Bytecount len,
 	       Bytebpos pos, Bytebpos lim, EMACS_INT n, Lisp_Object trt)
 {
   int forward = n > 0;
@@ -1373,16 +1373,16 @@
 	  {
 	    Bytecount this_len = len;
 	    Bytebpos this_pos = pos;
-	    Intbyte *p = base_pat;
+	    Ibyte *p = base_pat;
 	    if (pos >= lim)
 	      goto stop;

 	    while (this_len > 0)
 	      {
-		Emchar pat_ch, buf_ch;
+		Ichar pat_ch, buf_ch;
 		Bytecount pat_len;

-		pat_ch = charptr_emchar (p);
+		pat_ch = itext_ichar (p);
 		buf_ch = BYTE_BUF_FETCH_CHAR (buf, this_pos);

 		buf_ch = TRANSLATE (trt, buf_ch);
@@ -1390,7 +1390,7 @@
 		if (buf_ch != pat_ch)
 		  break;

-		pat_len = charptr_emchar_len (p);
+		pat_len = itext_ichar_len (p);
 		p += pat_len;
 		this_len -= pat_len;
 		INC_BYTEBPOS (buf, this_pos);
@@ -1412,18 +1412,18 @@
 	  {
 	    Bytecount this_len = len;
 	    Bytebpos this_pos = pos;
-	    Intbyte *p;
+	    Ibyte *p;
 	    if (pos <= lim)
 	      goto stop;
 	    p = base_pat + len;

 	    while (this_len > 0)
 	      {
-		Emchar pat_ch, buf_ch;
-
-		DEC_CHARPTR (p);
+		Ichar pat_ch, buf_ch;
+
+		DEC_IBYTEPTR (p);
 		DEC_BYTEBPOS (buf, this_pos);
-		pat_ch = charptr_emchar (p);
+		pat_ch = itext_ichar (p);
 		buf_ch = BYTE_BUF_FETCH_CHAR (buf, this_pos);

 		buf_ch = TRANSLATE (trt, buf_ch);
@@ -1431,7 +1431,7 @@
 		if (buf_ch != pat_ch)
 		  break;

-		this_len -= charptr_emchar_len (p);
+		this_len -= itext_ichar_len (p);
 	      }
 	    if (this_len == 0)
 	      {
@@ -1481,7 +1481,7 @@
    If that criterion is not satisfied, do not call this function.  */

 static Charbpos
-boyer_moore (struct buffer *buf, Intbyte *base_pat, Bytecount len,
+boyer_moore (struct buffer *buf, Ibyte *base_pat, Bytecount len,
 	     Bytebpos pos, Bytebpos lim, EMACS_INT n, Lisp_Object trt,
 	     Lisp_Object inverse_trt, int charset_base)
 {
@@ -1522,13 +1522,13 @@
   Bytebpos limit;
   Bytecount stride_for_teases = 0;
   REGISTER EMACS_INT i, j;
-  Intbyte *pat, *pat_end;
-  REGISTER Intbyte *cursor, *p_limit, *ptr2;
-  Intbyte simple_translate[0400];
+  Ibyte *pat, *pat_end;
+  REGISTER Ibyte *cursor, *p_limit, *ptr2;
+  Ibyte simple_translate[0400];
   REGISTER int direction = ((n > 0) ? 1 : -1);
 #ifdef MULE
-  Intbyte translate_prev_byte = 0;
-  Intbyte translate_anteprev_byte = 0;
+  Ibyte translate_prev_byte = 0;
+  Ibyte translate_anteprev_byte = 0;
 #endif
 #ifdef C_ALLOCA
   EMACS_INT BM_tab_space[0400];
@@ -1589,34 +1589,34 @@
      in the pattern.  Others don't matter anyway!  */
   xzero (simple_translate);
   for (i = 0; i < 0400; i++)
-    simple_translate[i] = (Intbyte) i;
+    simple_translate[i] = (Ibyte) i;
   i = 0;
   while (i != infinity)
     {
-      Intbyte *ptr = base_pat + i;
+      Ibyte *ptr = base_pat + i;
       i += direction;
       if (i == dirlen)
 	i = infinity;
       if (!NILP (trt))
 	{
 #ifdef MULE
-	  Emchar ch, untranslated;
+	  Ichar ch, untranslated;
 	  int this_translated = 1;

 	  /* Is *PTR the last byte of a character?  */
-	  if (pat_end - ptr == 1 || intbyte_first_byte_p (ptr[1]))
+	  if (pat_end - ptr == 1 || ibyte_first_byte_p (ptr[1]))
 	    {
-	      Intbyte *charstart = ptr;
-	      while (!intbyte_first_byte_p (*charstart))
+	      Ibyte *charstart = ptr;
+	      while (!ibyte_first_byte_p (*charstart))
 		charstart--;
-	      untranslated = charptr_emchar (charstart);
-	      if (charset_base == (untranslated & ~EMCHAR_FIELD3_MASK))
+	      untranslated = itext_ichar (charstart);
+	      if (charset_base == (untranslated & ~ICHAR_FIELD3_MASK))
 		{
 		  ch = TRANSLATE (trt, untranslated);
-		  if (!intbyte_first_byte_p (*ptr))
+		  if (!ibyte_first_byte_p (*ptr))
 		    {
 		      translate_prev_byte = ptr[-1];
-		      if (!intbyte_first_byte_p (translate_prev_byte))
+		      if (!ibyte_first_byte_p (translate_prev_byte))
 			translate_anteprev_byte = ptr[-2];
 		    }
 		}
@@ -1643,7 +1643,7 @@
 	     see comment in casetab.c. */
 	  if (this_translated)
 	    {
-	      Emchar starting_ch = ch;
+	      Ichar starting_ch = ch;
 	      EMACS_INT starting_j = j;
 	      while (1)
 		{
@@ -1656,7 +1656,7 @@
 		  /* For all the characters that map into CH,
 		     set up simple_translate to map the last byte
 		     into STARTING_J.  */
-		  simple_translate[j] = (Intbyte) starting_j;
+		  simple_translate[j] = (Ibyte) starting_j;
 		  if (ch == starting_ch)
 		    break;
 		  BM_tab[j] = dirlen - i;
@@ -1673,7 +1673,7 @@
 	     see comment in casetab.c. */
 	  while ((j = TRANSLATE (inverse_trt, j)) != k)
 	    {
-	      simple_translate[j] = (Intbyte) k;
+	      simple_translate[j] = (Ibyte) k;
 	      BM_tab[j] = dirlen - i;
 	    }
 #endif
@@ -1699,7 +1699,7 @@
   while (n != 0)
     {
       Bytebpos tail_end;
-      Intbyte *tail_end_ptr;
+      Ibyte *tail_end_ptr;
       /* It's been reported that some (broken) compiler thinks
 	 that Boolean expressions in an arithmetic context are
 	 unsigned.  Using an explicit ?1:0 prevents this.  */
@@ -1782,14 +1782,14 @@
 		  while ((i -= direction) + direction != 0)
 		    {
 #ifdef MULE
-		      Emchar ch;
+		      Ichar ch;
 		      cursor -= direction;
 		      /* Translate only the last byte of a character.  */
 		      if ((cursor == tail_end_ptr
-			   || intbyte_first_byte_p (cursor[1]))
-			  && (intbyte_first_byte_p (cursor[0])
+			   || ibyte_first_byte_p (cursor[1]))
+			  && (ibyte_first_byte_p (cursor[0])
 			      || (translate_prev_byte == cursor[-1]
-				  && (intbyte_first_byte_p (translate_prev_byte)
+				  && (ibyte_first_byte_p (translate_prev_byte)
 				      || translate_anteprev_byte == cursor[-2]))))
 			ch = simple_translate[*cursor];
 		      else
@@ -1869,17 +1869,17 @@
 	      while ((i -= direction) + direction != 0)
 		{
 #ifdef MULE
-		  Emchar ch;
-		  Intbyte *ptr;
+		  Ichar ch;
+		  Ibyte *ptr;
 #endif
 		  pos -= direction;
 #ifdef MULE
 		  ptr = BYTE_BUF_BYTE_ADDRESS_NO_VERIFY (buf, pos);
 		  if ((ptr == tail_end_ptr
-		       || intbyte_first_byte_p (ptr[1]))
-		      && (intbyte_first_byte_p (ptr[0])
+		       || ibyte_first_byte_p (ptr[1]))
+		      && (ibyte_first_byte_p (ptr[0])
 			  || (translate_prev_byte == ptr[-1]
-			      && (intbyte_first_byte_p (translate_prev_byte)
+			      && (ibyte_first_byte_p (translate_prev_byte)
 				  || translate_anteprev_byte == ptr[-2]))))
 		    ch = simple_translate[*ptr];
 		  else
@@ -1967,37 +1967,37 @@
   len = string_char_length (string);

   for (i = 0; i < len; i++)
-    if (!WORD_SYNTAX_P (syntax_table, string_emchar (string, i)))
+    if (!WORD_SYNTAX_P (syntax_table, string_ichar (string, i)))
       {
 	punct_count++;
 	if (i > 0 && WORD_SYNTAX_P (syntax_table,
-				    string_emchar (string, i - 1)))
+				    string_ichar (string, i - 1)))
           word_count++;
       }
-  if (WORD_SYNTAX_P (syntax_table, string_emchar (string, len - 1)))
+  if (WORD_SYNTAX_P (syntax_table, string_ichar (string, len - 1)))
     word_count++;
   if (!word_count) return build_string ("");

   {
     /* The following value is an upper bound on the amount of storage we
        need.  In non-Mule, it is exact. */
-    Intbyte *storage =
-      (Intbyte *) ALLOCA (XSTRING_LENGTH (string) - punct_count +
+    Ibyte *storage =
+      (Ibyte *) ALLOCA (XSTRING_LENGTH (string) - punct_count +
                           5 * (word_count - 1) + 4);
-    Intbyte *o = storage;
+    Ibyte *o = storage;

     *o++ = '\\';
     *o++ = 'b';

     for (i = 0; i < len; i++)
       {
-	Emchar ch = string_emchar (string, i);
+	Ichar ch = string_ichar (string, i);

 	if (WORD_SYNTAX_P (syntax_table, ch))
-	  o += set_charptr_emchar (o, ch);
+	  o += set_itext_ichar (o, ch);
 	else if (i > 0
 		 && WORD_SYNTAX_P (syntax_table,
-				   string_emchar (string, i - 1))
+				   string_ichar (string, i - 1))
 		 && --word_count)
 	  {
 	    *o++ = '\\';
@@ -2287,7 +2287,7 @@
   int some_lowercase;
   int some_uppercase;
   int some_nonuppercase_initial;
-  Emchar c, prevc;
+  Ichar c, prevc;
   Charcount inslen;
   struct buffer *buf;
   Lisp_Object syntax_table;
@@ -2375,7 +2375,7 @@
 	  if (NILP (string))
 	    c = BUF_FETCH_CHAR (buf, pos);
 	  else
-	    c = string_emchar (string, pos);
+	    c = string_ichar (string, pos);

 	  if (LOWERCASEP (buf, c))
 	    {
@@ -2460,10 +2460,10 @@
 	      Charcount substart = -1;
 	      Charcount subend   = -1;

-	      c = string_emchar (replacement, strpos);
+	      c = string_ichar (replacement, strpos);
 	      if (c == '\\' && strpos < stlen - 1)
 		{
-		  c = string_emchar (replacement, ++strpos);
+		  c = string_ichar (replacement, ++strpos);
 		  if (c == '&')
 		    {
 		      literal_end = strpos - 1;
@@ -2553,8 +2553,8 @@

 	  for (strpos = 0; strpos < stlen; strpos++)
 	    {
-	      Emchar curchar = string_emchar (replacement, strpos);
-	      Emchar newchar = -1;
+	      Ichar curchar = string_ichar (replacement, strpos);
+	      Ichar newchar = -1;
 	      if (i < Dynarr_length (ul_pos_dynarr) &&
 		  strpos == Dynarr_at (ul_pos_dynarr, i))
 		{
@@ -2614,7 +2614,7 @@
 	   */
 	  Charcount offset = BUF_PT (buf) - search_regs.start[sub];

-	  c = string_emchar (replacement, strpos);
+	  c = string_ichar (replacement, strpos);
 	  if (c == '\\' && strpos < stlen - 1)
 	    {
 	      /* XXX FIXME: replacing just a substring non-literally
@@ -2623,7 +2623,7 @@
 		 <duwe@caldera.de> claims Finsert_buffer_substring already
 		 handles this correctly.
 	      */
-	      c = string_emchar (replacement, ++strpos);
+	      c = string_ichar (replacement, ++strpos);
 	      if (c == '&')
 		Finsert_buffer_substring
                   (buffer,
@@ -2686,8 +2686,8 @@

       for (pos = BUF_PT (buf) - inslen; pos < eend; pos++)
 	{
-	  Emchar curchar = BUF_FETCH_CHAR (buf, pos);
-	  Emchar newchar = -1;
+	  Ichar curchar = BUF_FETCH_CHAR (buf, pos);
+	  Ichar newchar = -1;
 	  if (i < Dynarr_length (ul_pos_dynarr) &&
 	      pos == Dynarr_at (ul_pos_dynarr, i))
 	    {
@@ -2963,12 +2963,12 @@
 */
        (string))
 {
-  REGISTER Intbyte *in, *out, *end;
-  REGISTER Intbyte *temp;
+  REGISTER Ibyte *in, *out, *end;
+  REGISTER Ibyte *temp;

   CHECK_STRING (string);

-  temp = (Intbyte *) ALLOCA (XSTRING_LENGTH (string) * 2);
+  temp = (Ibyte *) ALLOCA (XSTRING_LENGTH (string) * 2);

   /* Now copy the data into the new string, inserting escapes. */

@@ -2978,15 +2978,15 @@

   while (in < end)
     {
-      Emchar c = charptr_emchar (in);
+      Ichar c = itext_ichar (in);

       if (c == '[' || c == ']'
 	  || c == '*' || c == '.' || c == '\\'
 	  || c == '?' || c == '+'
 	  || c == '^' || c == '$')
 	*out++ = '\\';
-      out += set_charptr_emchar (out, c);
-      INC_CHARPTR (in);
+      out += set_itext_ichar (out, c);
+      INC_IBYTEPTR (in);
     }

   return make_string (temp, out - temp);
--- a/src/select-common.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/select-common.h	Wed Jun 05 09:58:45 2002 +0000
@@ -210,13 +210,13 @@
     }
   else if (CHARP (obj))
     {
-      Intbyte buf[MAX_EMCHAR_LEN];
+      Ibyte buf[MAX_ICHAR_LEN];
       Bytecount len;
       const Extbyte *extval;
       Bytecount extvallen;

       *format_ret = 8;
-      len = set_charptr_emchar (buf, XCHAR (obj));
+      len = set_itext_ichar (buf, XCHAR (obj));
       TO_EXTERNAL_FORMAT (DATA, (buf, len),
 			  ALLOCA, (extval, extvallen),
 			  Qctext);
--- a/src/select-gtk.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/select-gtk.c	Wed Jun 05 09:58:45 2002 +0000
@@ -68,7 +68,7 @@
   if (atom == GDK_SELECTION_SECONDARY) return (QSECONDARY);

   {
-    Intbyte *intstr;
+    Ibyte *intstr;
     Extbyte *str = gdk_atom_name (atom);

     if (! str) return Qnil;
--- a/src/select-x.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/select-x.c	Wed Jun 05 09:58:45 2002 +0000
@@ -179,7 +179,7 @@
 #endif

   {
-    Intbyte *intstr;
+    Ibyte *intstr;
     Extbyte *str = XGetAtomName (display, atom);

     if (! str) return Qnil;
@@ -287,13 +287,13 @@
 #endif
       XmString fmh;
       String encoding = "STRING";
-      const Intbyte *data  = XSTRING_DATA (selection_value);
+      const Ibyte *data  = XSTRING_DATA (selection_value);
       Bytecount bytes = XSTRING_LENGTH (selection_value);

 #ifdef MULE
       {
 	enum { ASCII, LATIN_1, WORLD } chartypes = ASCII;
-	const Intbyte *ptr = data, *end = ptr + bytes;
+	const Ibyte *ptr = data, *end = ptr + bytes;
 	/* Optimize for the common ASCII case */
 	while (ptr <= end)
 	  {
@@ -1294,12 +1294,12 @@
   Display *display = DEVICE_X_DISPLAY (d);
   Window window = RootWindow (display, 0); /* Cutbuffers are on frame 0 */
   Atom cut_buffer_atom;
-  const Intbyte *data  = XSTRING_DATA (string);
+  const Ibyte *data  = XSTRING_DATA (string);
   Bytecount bytes = XSTRING_LENGTH (string);
   Bytecount bytes_remaining;
   Bytecount max_bytes = SELECTION_QUANTUM (display);
 #ifdef MULE
-  const Intbyte *ptr, *end;
+  const Ibyte *ptr, *end;
   enum { ASCII, LATIN_1, WORLD } chartypes = ASCII;
 #endif
--- a/src/sound.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/sound.h	Wed Jun 05 09:58:45 2002 +0000
@@ -31,15 +31,15 @@

 # define sound_perror(string)						 \
 do {									 \
-  Intbyte *errmess;							 \
-  Intbyte *string_int;							 \
+  Ibyte *errmess;							 \
+  Ibyte *string_int;							 \
   GET_STRERROR (errmess, errno);					 \
   EXTERNAL_TO_C_STRING (string, string_int, Qnative);			 \
   warn_when_safe (Qsound, Qerror, "audio: %s, %s", string_int, errmess); \
 } while (0)
 # define sound_warn(string)					\
 do {								\
-  Intbyte *string_int;						\
+  Ibyte *string_int;						\
   EXTERNAL_TO_C_STRING (GETTEXT (string), string_int, Qnative);	\
   warn_when_safe (Qsound, Qwarning, "audio: %s", string_int);	\
 } while (0)
--- a/src/symbols.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/symbols.c	Wed Jun 05 09:58:45 2002 +0000
@@ -174,7 +174,7 @@
 }

 Lisp_Object
-intern_int (const Intbyte *str)
+intern_int (const Ibyte *str)
 {
   Bytecount len = qxestrlen (str);
   Lisp_Object obarray = Vobarray;
@@ -192,22 +192,22 @@
 }

 Lisp_Object
-intern (const CIntbyte *str)
+intern (const CIbyte *str)
 {
-  return intern_int ((Intbyte *) str);
+  return intern_int ((Ibyte *) str);
 }

 Lisp_Object
-intern_converting_underscores_to_dashes (const CIntbyte *str)
+intern_converting_underscores_to_dashes (const CIbyte *str)
 {
   Bytecount len = strlen (str);
-  CIntbyte *tmp = alloca_extbytes (len + 1);
+  CIbyte *tmp = alloca_extbytes (len + 1);
   Bytecount i;
   strcpy (tmp, str);
   for (i = 0; i < len; i++)
     if (tmp[i] == '_')
       tmp[i] = '-';
-  return intern_int ((Intbyte *) tmp);
+  return intern_int ((Ibyte *) tmp);
 }

 DEFUN ("intern", Fintern, 1, 2, 0, /*
@@ -354,7 +354,7 @@
    Also store the bucket number in oblookup_last_bucket_number.  */

 Lisp_Object
-oblookup (Lisp_Object obarray, const Intbyte *ptr, Bytecount size)
+oblookup (Lisp_Object obarray, const Ibyte *ptr, Bytecount size)
 {
   unsigned int hash, obsize;
   Lisp_Symbol *tail;
@@ -393,7 +393,7 @@
    Investigation by Karl Nelson <kenelson@ece.ucdavis.edu>.
    Do a web search for "g_str_hash X31_HASH" if you want to know more. */
 unsigned int
-hash_string (const Intbyte *ptr, Bytecount len)
+hash_string (const Ibyte *ptr, Bytecount len)
 {
   unsigned int hash;

@@ -3227,7 +3227,7 @@

   /* Bootstrapping problem: Qnil isn't set when make_string_nocopy is
      called the first time. */
-  Qnil = Fmake_symbol (make_string_nocopy ((const Intbyte *) "nil", 3));
+  Qnil = Fmake_symbol (make_string_nocopy ((const Ibyte *) "nil", 3));
   XSTRING_PLIST (XSYMBOL (Qnil)->name) = Qnil;
   XSYMBOL (Qnil)->value = Qnil; /* Nihil ex nihil */
   XSYMBOL (Qnil)->plist = Qnil;
@@ -3286,7 +3286,7 @@
   for (i = 0; i < len; i++)
     if (temp[i] == '_')
       temp[i] = '-';
-  *location = Fintern (make_string ((const Intbyte *) temp, len), Qnil);
+  *location = Fintern (make_string ((const Ibyte *) temp, len), Qnil);
   if (dump_p)
     staticpro (location);
   else
@@ -3321,7 +3321,7 @@
 void
 defsymbol_nodump (Lisp_Object *location, const char *name)
 {
-  *location = Fintern (make_string_nocopy ((const Intbyte *) name,
+  *location = Fintern (make_string_nocopy ((const Ibyte *) name,
 					   strlen (name)),
 		       Qnil);
   staticpro_nodump (location);
@@ -3330,7 +3330,7 @@
 void
 defsymbol (Lisp_Object *location, const char *name)
 {
-  *location = Fintern (make_string_nocopy ((const Intbyte *) name,
+  *location = Fintern (make_string_nocopy ((const Ibyte *) name,
 					   strlen (name)),
 		       Qnil);
   staticpro (location);
@@ -3592,7 +3592,7 @@
     sym = Fintern (build_string (symbol_name), Qnil);
   else
 #endif
-    sym = Fintern (make_string_nocopy ((const Intbyte *) symbol_name,
+    sym = Fintern (make_string_nocopy ((const Ibyte *) symbol_name,
 				       strlen (symbol_name)), Qnil);

   XSYMBOL (sym)->value = wrap_pointer_1 (magic);
--- a/src/syntax.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/syntax.c	Wed Jun 05 09:58:45 2002 +0000
@@ -93,7 +93,7 @@
 struct lisp_parse_state
 {
   int depth;		/* Depth at end of parsing */
-  Emchar instring;	/* -1 if not within string, else desired terminator */
+  Ichar instring;	/* -1 if not within string, else desired terminator */
   int incomment;	/* Nonzero if within a comment at end of parsing */
   int comstyle;		/* comment style a=0, or b=1, or ST_COMMENT_STYLE */
   int quoted;		/* Nonzero if just after an escape char at end of
@@ -590,7 +590,7 @@
 #endif

 Lisp_Object
-syntax_match (Lisp_Object syntax_table, Emchar ch)
+syntax_match (Lisp_Object syntax_table, Ichar ch)
 {
   Lisp_Object code = get_char_table (ch, syntax_table);
   Lisp_Object code2 = code;
@@ -631,7 +631,7 @@
    There is no word boundary between two word-constituent ASCII
    characters.  */
 #define WORD_BOUNDARY_P(c1, c2)			\
-  (!(emchar_ascii_p (c1) && emchar_ascii_p (c2))	\
+  (!(ichar_ascii_p (c1) && ichar_ascii_p (c2))	\
    && word_boundary_p (c1, c2))
 #endif

@@ -643,7 +643,7 @@
 scan_words (struct buffer *buf, Charbpos from, int count)
 {
   Charbpos limit = count > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
-  Emchar ch0, ch1;
+  Ichar ch0, ch1;
   enum syntaxcode code;
   struct syntax_cache *scache = setup_buffer_syntax_cache (buf, from, count);

@@ -790,7 +790,7 @@
 find_start_of_comment (struct buffer *buf, Charbpos from, Charbpos stop,
 		       int comstyle)
 {
-  Emchar c;
+  Ichar c;
   enum syntaxcode code;

   /* Look back, counting the parity of string-quotes,
@@ -803,7 +803,7 @@
      which is I+2X quotes from the comment-end.
      PARITY is current parity of quotes from the comment end.  */
   int parity = 0;
-  Emchar my_stringend = 0;
+  Ichar my_stringend = 0;
   int string_lossage = 0;
   Charbpos comment_end = from;
   Charbpos comstart_pos = 0;
@@ -1065,7 +1065,7 @@
 {
   Charbpos from;
   Charbpos stop;
-  Emchar c;
+  Ichar c;
   enum syntaxcode code;
   int syncode;
   EMACS_INT n;
@@ -1255,7 +1255,7 @@
 	    int sexpflag, int noerror)
 {
   Charbpos stop;
-  Emchar c;
+  Ichar c;
   int quoted;
   int mathexit = 0;
   enum syntaxcode code;
@@ -1400,12 +1400,12 @@
 	    case Sstring_fence:
 	    case Sstring:
               {
-		Emchar stringterm;
+		Ichar stringterm;

 		if (code != Sstring_fence)
 		  {
 		    /* XEmacs change: call syntax_match on character */
-		    Emchar ch = BUF_FETCH_CHAR (buf, from - 1);
+		    Ichar ch = BUF_FETCH_CHAR (buf, from - 1);
 		    Lisp_Object stermobj =
 		      syntax_match (scache->current_syntax_table, ch);

@@ -1580,12 +1580,12 @@
 	    case Sstring_fence:
 	    case Sstring:
               {
-		Emchar stringterm;
+		Ichar stringterm;

 		if (code != Sstring_fence)
 		  {
 		/* XEmacs change: call syntax_match() on character */
-                Emchar ch = BUF_FETCH_CHAR (buf, from);
+                Ichar ch = BUF_FETCH_CHAR (buf, from);
 		    Lisp_Object stermobj =
 		      syntax_match (scache->current_syntax_table, ch);

@@ -1736,7 +1736,7 @@
   struct buffer *buf = decode_buffer (buffer, 0);
   Charbpos beg = BUF_BEGV (buf);
   Charbpos pos = BUF_PT (buf);
-  Emchar c = '\0'; /* initialize to avoid compiler warnings */
+  Ichar c = '\0'; /* initialize to avoid compiler warnings */
   struct syntax_cache *scache;

   scache = setup_buffer_syntax_cache (buf, pos, -1);
@@ -1862,7 +1862,7 @@

   while (from < end)
     {
-      Emchar c;
+      Ichar c;
       int syncode;

       QUIT;
@@ -2010,7 +2010,7 @@
 	  else
 	    {
 	      /* XEmacs change: call syntax_match() on character */
-	      Emchar ch = BUF_FETCH_CHAR (buf, from - 1);
+	      Ichar ch = BUF_FETCH_CHAR (buf, from - 1);
 	      Lisp_Object stermobj =
 		syntax_match (scache->current_syntax_table, ch);

@@ -2377,7 +2377,7 @@
 void
 complex_vars_of_syntax (void)
 {
-  Emchar i;
+  Ichar i;
   const char *p;
   /* Set this now, so first buffer creation can refer to it. */
   /* Make it nil before calling copy-syntax-table
--- a/src/syntax.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/syntax.h	Wed Jun 05 09:58:45 2002 +0000
@@ -82,7 +82,7 @@

 DECLARE_INLINE_HEADER (
 int
-WORD_SYNTAX_P (Lisp_Object table, Emchar c)
+WORD_SYNTAX_P (Lisp_Object table, Ichar c)
 )
 {
   return SYNTAX (table, c) == Sword;
@@ -242,7 +242,7 @@

 /* NOTE: This does not refer to the mirror table, but to the
    syntax table itself. */
-Lisp_Object syntax_match (Lisp_Object table, Emchar ch);
+Lisp_Object syntax_match (Lisp_Object table, Ichar ch);

 extern int no_quit_in_re_search;
--- a/src/sysdep.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/sysdep.c	Wed Jun 05 09:58:45 2002 +0000
@@ -569,10 +569,10 @@
 sys_subshell (void)
 {
   Lisp_Object dir;
-  Intbyte *str = 0;
+  Ibyte *str = 0;
   Bytecount len;
   struct gcpro gcpro1;
-  Intbyte *sh = 0;
+  Ibyte *sh = 0;
   Extbyte *shext;

   /* Use our buffer's default directory for the subshell.  */
@@ -590,7 +590,7 @@
   dir = Funhandled_file_name_directory (dir);
   dir = expand_and_dir_to_file (dir, Qnil);

-  str = (Intbyte *) ALLOCA (XSTRING_LENGTH (dir) + 2);
+  str = (Ibyte *) ALLOCA (XSTRING_LENGTH (dir) + 2);
   len = XSTRING_LENGTH (dir);
   memcpy (str, XSTRING_DATA (dir), len);
   if (!IS_ANY_SEP (str[len - 1]))
@@ -743,10 +743,10 @@

 /* Figure out the eof character for the FD. */

-Intbyte
+Ibyte
 get_eof_char (int fd)
 {
-  const Intbyte ctrl_d = (Intbyte) '\004';
+  const Ibyte ctrl_d = (Ibyte) '\004';

   if (!isatty (fd))
     return ctrl_d;
@@ -759,9 +759,9 @@
     if ((int) strlen ((const char *) t.c_cc) < (VEOF + 1))
       return ctrl_d;
     else
-      return (Intbyte) t.c_cc[VEOF];
+      return (Ibyte) t.c_cc[VEOF];
 #endif
-    return t.c_cc[VEOF] == _POSIX_VDISABLE ? ctrl_d : (Intbyte) t.c_cc[VEOF];
+    return t.c_cc[VEOF] == _POSIX_VDISABLE ? ctrl_d : (Ibyte) t.c_cc[VEOF];
   }
 #else /* ! HAVE_TERMIOS */
   /* On Berkeley descendants, the following IOCTL's retrieve the
@@ -770,7 +770,7 @@
   {
     struct tchars c;
     ioctl (fd, TIOCGETC, &c);
-    return (Intbyte) c.t_eofc;
+    return (Ibyte) c.t_eofc;
   }
 #else /* ! defined (TIOCGLTC) && defined (TIOCGETC) */
   /* On SYSV descendants, the TCGETA ioctl retrieves the current control
@@ -782,7 +782,7 @@
     if ((int) strlen ((const char *) t.c_cc) < (VINTR + 1))
       return ctrl_d;
     else
-      return (Intbyte) t.c_cc[VINTR];
+      return (Ibyte) t.c_cc[VINTR];
   }
 #else /* ! defined (TCGETA) */
   /* Rather than complain, we'll just guess ^D, which is what
@@ -2324,7 +2324,7 @@
   Vsystem_name = build_string (hostname);
 #endif /* HAVE_GETHOSTNAME  */
   {
-    Intbyte *p;
+    Ibyte *p;
     Bytecount i;

     for (i = 0, p = XSTRING_DATA (Vsystem_name);
@@ -2563,7 +2563,7 @@
    external encoding, interruptions, etc. */

 int
-qxe_open (const Intbyte *path, int oflag, ...)
+qxe_open (const Ibyte *path, int oflag, ...)
 {
   Extbyte *pathout;
   int mode;
@@ -2586,7 +2586,7 @@
    is not interrupted by C-g.  However, the worst that can happen is
    the fallback to simple open().  */
 int
-qxe_interruptible_open (const Intbyte *path, int oflag, int mode)
+qxe_interruptible_open (const Ibyte *path, int oflag, int mode)
 {
   /* This function can GC */
   Extbyte *pathout;
@@ -2773,7 +2773,7 @@
 }

 FILE *
-qxe_fopen (const Intbyte *path, const Char_ASCII *mode)
+qxe_fopen (const Ibyte *path, const Char_ASCII *mode)
 {
   Extbyte *pathout;
   PATHNAME_CONVERT_OUT (path, pathout);
@@ -2854,7 +2854,7 @@
 /********************* directory calls *******************/

 int
-qxe_chdir (const Intbyte *path)
+qxe_chdir (const Ibyte *path)
 {
   Extbyte *pathout;
   PATHNAME_CONVERT_OUT (path, pathout);
@@ -2869,7 +2869,7 @@
 }

 int
-qxe_mkdir (const Intbyte *path, mode_t mode)
+qxe_mkdir (const Ibyte *path, mode_t mode)
 {
   Extbyte *pathout;
   PATHNAME_CONVERT_OUT (path, pathout);
@@ -2884,7 +2884,7 @@
 }

 DIR *
-qxe_opendir (const Intbyte *filename)
+qxe_opendir (const Ibyte *filename)
 {
 #ifdef WIN32_NATIVE
   return mswindows_opendir (filename);
@@ -2921,7 +2921,7 @@
   {
     const Extbyte * const external_name = (const Extbyte *) rtnval->d_name;
     Bytecount external_len = strlen (rtnval->d_name);
-    const Intbyte *internal_name;
+    const Ibyte *internal_name;
     Bytecount internal_len;

     TO_INTERNAL_FORMAT (DATA, (external_name, external_len),
@@ -2934,13 +2934,13 @@
       return rtnval;

     { /* Non-ASCII filename */
-      static Intbyte_dynarr *internal_DIRENTRY;
+      static Ibyte_dynarr *internal_DIRENTRY;
       if (!internal_DIRENTRY)
-        internal_DIRENTRY = Dynarr_new (Intbyte);
+        internal_DIRENTRY = Dynarr_new (Ibyte);
       else
         Dynarr_reset (internal_DIRENTRY);

-      Dynarr_add_many (internal_DIRENTRY, (Intbyte *) rtnval,
+      Dynarr_add_many (internal_DIRENTRY, (Ibyte *) rtnval,
                        offsetof (DIRENTRY, d_name));


@@ -2969,7 +2969,7 @@
 }

 int
-qxe_rmdir (const Intbyte *path)
+qxe_rmdir (const Ibyte *path)
 {
   Extbyte *pathout;
   PATHNAME_CONVERT_OUT (path, pathout);
@@ -2983,7 +2983,7 @@
 #endif
 }

-Intbyte *
+Ibyte *
 qxe_allocating_getcwd (void)
 {
 #ifdef HAVE_GETCWD
@@ -3005,7 +3005,7 @@

       if (ret)
 	{
-	  Intbyte *retin;
+	  Ibyte *retin;
 	  TSTR_TO_C_STRING_MALLOC (ret, retin);
 	  xfree (cwd);
 	  return retin;
@@ -3014,7 +3014,7 @@
       Extbyte *ret = getcwd (cwd, cwdsize);
       if (ret)
 	{
-	  Intbyte *retin;
+	  Ibyte *retin;
 	  EXTERNAL_TO_C_STRING_MALLOC (ret, retin, Qfile_name);
 	  xfree (cwd);
 	  return retin;
@@ -3034,7 +3034,7 @@
     }
 #else
   Extbyte chingame_limitos_arbitrarios[PATH_MAX];
-  Intbyte *ret2;
+  Ibyte *ret2;

   if (!getwd (chingame_limitos_arbitrarios))
     return 0;
@@ -3046,7 +3046,7 @@
 /***************** file-information calls ******************/

 int
-qxe_access (const Intbyte *path, int mode)
+qxe_access (const Ibyte *path, int mode)
 {
 #ifdef WIN32_NATIVE
   return mswindows_access (path, mode);
@@ -3059,7 +3059,7 @@

 #if defined (HAVE_EACCESS)
 int
-qxe_eaccess (const Intbyte *path, int mode)
+qxe_eaccess (const Ibyte *path, int mode)
 {
   Extbyte *pathout;
   PATHNAME_CONVERT_OUT (path, pathout);
@@ -3068,7 +3068,7 @@
 #endif /* defined (HAVE_EACCESS) */

 int
-qxe_lstat (const Intbyte *path, struct stat *buf)
+qxe_lstat (const Ibyte *path, struct stat *buf)
 {
   /* if system does not have symbolic links, it does not have lstat.
      In that case, use ordinary stat instead.  */
@@ -3083,7 +3083,7 @@

 #if defined (HAVE_READLINK)
 int
-qxe_readlink (const Intbyte *path, Intbyte *buf, size_t bufsiz)
+qxe_readlink (const Ibyte *path, Ibyte *buf, size_t bufsiz)
 {
   int retval;
   Extbyte *pathout;
@@ -3093,7 +3093,7 @@
   if (retval < 0)
     return retval;
   {
-    Intbyte *intbuf;
+    Ibyte *intbuf;
     Bytecount tamanho;

     TO_INTERNAL_FORMAT (DATA, (buf, retval),
@@ -3118,7 +3118,7 @@
 }

 int
-qxe_stat (const Intbyte *path, struct stat *buf)
+qxe_stat (const Ibyte *path, struct stat *buf)
 {
 #ifdef WIN32_NATIVE
   return mswindows_stat (path, buf);
@@ -3133,7 +3133,7 @@
 /****************** file-manipulation calls *****************/

 int
-qxe_chmod (const Intbyte *path, mode_t mode)
+qxe_chmod (const Ibyte *path, mode_t mode)
 {
   Extbyte *pathout;
   PATHNAME_CONVERT_OUT (path, pathout);
@@ -3149,7 +3149,7 @@

 #if defined (HAVE_LINK)
 int
-qxe_link (const Intbyte *existing, const Intbyte *new)
+qxe_link (const Ibyte *existing, const Ibyte *new)
 {
 #ifdef WIN32_NATIVE
   return mswindows_link (existing, new);
@@ -3163,7 +3163,7 @@
 #endif /* defined (HAVE_LINK) */

 int
-qxe_rename (const Intbyte *old, const Intbyte *new)
+qxe_rename (const Ibyte *old, const Ibyte *new)
 {
 #ifdef WIN32_NATIVE
   /* Windows rename fails if NEW exists */
@@ -3184,7 +3184,7 @@

 #if defined (HAVE_SYMLINK)
 int
-qxe_symlink (const Intbyte *name1, const Intbyte *name2)
+qxe_symlink (const Ibyte *name1, const Ibyte *name2)
 {
   Extbyte *name1out, *name2out;
   PATHNAME_CONVERT_OUT (name1, name1out);
@@ -3194,7 +3194,7 @@
 #endif /* defined (HAVE_SYMLINK) */

 int
-qxe_unlink (const Intbyte *path)
+qxe_unlink (const Ibyte *path)
 {
 #ifdef WIN32_NATIVE
   return mswindows_unlink (path);
@@ -3209,8 +3209,8 @@
 /****************** process calls *****************/

 int
-qxe_execve (const Intbyte *filename, Intbyte * const argv[],
-	    Intbyte * const envp[])
+qxe_execve (const Ibyte *filename, Ibyte * const argv[],
+	    Ibyte * const envp[])
 {
   int i, argc, envc;
   Extbyte *pathext;
@@ -3288,7 +3288,7 @@
 }

 struct passwd *
-qxe_getpwnam (const Intbyte *name)
+qxe_getpwnam (const Ibyte *name)
 {
 #ifdef WIN32_NATIVE
   /* Synthetic versions are defined in nt.c and already do conversion. */
@@ -3325,14 +3325,14 @@

 /****************** time calls *****************/

-static Intbyte *ctime_static;
-
-Intbyte *
+static Ibyte *ctime_static;
+
+Ibyte *
 qxe_ctime (const time_t *t)
 {
   Extbyte *str = (Extbyte *) ctime (t);
   if (!str) /* can happen on MS Windows */
-    return (Intbyte *) "Sun Jan 01 00:00:00 1970";
+    return (Ibyte *) "Sun Jan 01 00:00:00 1970";
   if (ctime_static)
     xfree (ctime_static);
   EXTERNAL_TO_C_STRING_MALLOC (str, ctime_static, Qnative);
--- a/src/sysdep.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/sysdep.h	Wed Jun 05 09:58:45 2002 +0000
@@ -45,7 +45,7 @@
 void set_descriptor_non_blocking (int fd);

 int get_pty_max_bytes (int fd);
-Intbyte get_eof_char (int fd);
+Ibyte get_eof_char (int fd);

 /* Wait for subprocess with process id `pid' to terminate and
    make sure it will get eliminated (not remain forever as a zombie) */
--- a/src/sysdir.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/sysdir.h	Wed Jun 05 09:58:45 2002 +0000
@@ -66,13 +66,13 @@

 /* encapsulation: directory calls */

-int qxe_chdir (const Intbyte *path);
-int qxe_mkdir (const Intbyte *path, mode_t mode);
-DIR *qxe_opendir (const Intbyte *filename);
+int qxe_chdir (const Ibyte *path);
+int qxe_mkdir (const Ibyte *path, mode_t mode);
+DIR *qxe_opendir (const Ibyte *filename);
 DIRENTRY *qxe_readdir (DIR *dirp);
 int qxe_closedir (DIR *dirp);
-int qxe_rmdir (const Intbyte *path);
+int qxe_rmdir (const Ibyte *path);

-Intbyte *qxe_allocating_getcwd (void);
+Ibyte *qxe_allocating_getcwd (void);

 #endif /* INCLUDED_sysdir_h_ */
--- a/src/sysfile.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/sysfile.h	Wed Jun 05 09:58:45 2002 +0000
@@ -327,8 +327,8 @@
 ssize_t retry_read (int, void *, size_t);
 ssize_t retry_write (int, const void *, size_t);
 int retry_open (const Extbyte *path, int oflag, ...);
-int qxe_open (const Intbyte *path, int oflag, ...);
-int qxe_interruptible_open (const Intbyte *path, int oflag, int mode);
+int qxe_open (const Ibyte *path, int oflag, ...);
+int qxe_interruptible_open (const Ibyte *path, int oflag, int mode);
 int retry_close (int);
 Bytecount read_allowing_quit (int fildes, void *buf, Bytecount size);
 Bytecount write_allowing_quit (int fildes, const void *buf,
@@ -339,34 +339,34 @@
 size_t retry_fread (void *, size_t, size_t, FILE *);
 size_t retry_fwrite (const void *, size_t, size_t, FILE *);
 FILE *retry_fopen (const Extbyte *path, const Char_ASCII *mode);
-FILE *qxe_fopen (const Intbyte *path, const Char_ASCII *mode);
+FILE *qxe_fopen (const Ibyte *path, const Char_ASCII *mode);
 int retry_fclose (FILE *);

 /* encapsulations: file-information calls */

-int qxe_access (const Intbyte *path, int mode);
-int qxe_eaccess (const Intbyte *path, int mode);
-int qxe_lstat (const Intbyte *path, struct stat *buf);
-int qxe_readlink (const Intbyte *path, Intbyte *buf, size_t bufsiz);
+int qxe_access (const Ibyte *path, int mode);
+int qxe_eaccess (const Ibyte *path, int mode);
+int qxe_lstat (const Ibyte *path, struct stat *buf);
+int qxe_readlink (const Ibyte *path, Ibyte *buf, size_t bufsiz);
 int qxe_fstat (int fd, struct stat *buf);
-int qxe_stat (const Intbyte *path, struct stat *buf);
-Intbyte *qxe_realpath (const Intbyte *path, Intbyte resolved_path []);
+int qxe_stat (const Ibyte *path, struct stat *buf);
+Ibyte *qxe_realpath (const Ibyte *path, Ibyte resolved_path []);

 /* encapsulations: file-manipulation calls */

-int qxe_chmod (const Intbyte *path, mode_t mode);
+int qxe_chmod (const Ibyte *path, mode_t mode);

 #if defined (HAVE_LINK)
-int qxe_link (const Intbyte *existing, const Intbyte *new);
+int qxe_link (const Ibyte *existing, const Ibyte *new);
 #endif /* defined (HAVE_LINK) */

-int qxe_rename (const Intbyte *old, const Intbyte *new);
+int qxe_rename (const Ibyte *old, const Ibyte *new);

 #if defined (HAVE_SYMLINK)
-int qxe_symlink (const Intbyte *name1, const Intbyte *name2);
+int qxe_symlink (const Ibyte *name1, const Ibyte *name2);
 #endif /* defined (HAVE_SYMLINK) */

-int qxe_unlink (const Intbyte *path);
+int qxe_unlink (const Ibyte *path);

 #endif /* emacs */

@@ -426,7 +426,7 @@
 #define SEPCHAR ';'
 #define DEFAULT_DIRECTORY_SEP '\\'

-DECLARE_INLINE_HEADER (Intbyte sysfile_get_directory_sep (void))
+DECLARE_INLINE_HEADER (Ibyte sysfile_get_directory_sep (void))
 {
   if (!CHARP (Vdirectory_sep_char)
       || (XCHAR (Vdirectory_sep_char) != '/'
@@ -458,12 +458,12 @@

 #define IS_DEVICE_SEP(c) ((c) == DEVICE_SEP)

-DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (Emchar c))
+DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (Ichar c))
 {
   return (c == '/' || c == '\\');
 }

-DECLARE_INLINE_HEADER (int IS_ANY_SEP (Emchar c))
+DECLARE_INLINE_HEADER (int IS_ANY_SEP (Ichar c))
 {
   return (c == '/' || c == '\\' || c == ':');
 }
--- a/src/sysproc.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/sysproc.h	Wed Jun 05 09:58:45 2002 +0000
@@ -178,8 +178,8 @@
 #endif /* no FD_SET */

 int poll_fds_for_input (SELECT_TYPE mask);
-int qxe_execve (const Intbyte *filename, Intbyte * const argv[],
-		Intbyte * const envp[]);
+int qxe_execve (const Ibyte *filename, Ibyte * const argv[],
+		Ibyte * const envp[]);
 pid_t qxe_getpid (void);

 /* #### I would really like to delete the remaining synchronous code entirely.
--- a/src/syspwd.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/syspwd.h	Wed Jun 05 09:58:45 2002 +0000
@@ -40,7 +40,7 @@
 #ifdef emacs

 struct passwd *getpwuid (uid_t uid);
-struct passwd *getpwnam (const Intbyte *name);
+struct passwd *getpwnam (const Ibyte *name);
 uid_t getuid (void);
 uid_t geteuid (void);
 gid_t getgid (void);
@@ -52,7 +52,7 @@

 #ifdef emacs

-struct passwd *qxe_getpwnam (const Intbyte *name);
+struct passwd *qxe_getpwnam (const Ibyte *name);
 struct passwd *qxe_getpwuid (uid_t uid);
 struct passwd *qxe_getpwent (void);
--- a/src/systime.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/systime.h	Wed Jun 05 09:58:45 2002 +0000
@@ -247,7 +247,7 @@
 int set_file_times (Lisp_Object path, EMACS_TIME atime, EMACS_TIME mtime);
 void get_process_times (double *user_time, double *system_time,
 			double *real_time);
-Intbyte *qxe_ctime (const time_t *value);
+Ibyte *qxe_ctime (const time_t *value);

 #endif
--- a/src/syswindows.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/syswindows.h	Wed Jun 05 09:58:45 2002 +0000
@@ -798,7 +798,7 @@
 Extbyte *convert_multibyte_to_unicode_malloc (const Extbyte *src,
 					      Bytecount n,
 					      int cp, Bytecount *size_out);
-Intbyte *convert_multibyte_to_internal_malloc (const Extbyte *src,
+Ibyte *convert_multibyte_to_internal_malloc (const Extbyte *src,
 					       Bytecount n,
 					       int cp, Bytecount *size_out);
 void convert_multibyte_to_unicode_dynarr (const Extbyte *src, Bytecount n,
@@ -827,7 +827,7 @@

 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out)			\
 do {								\
-  Intbyte *lttff;						\
+  Ibyte *lttff;						\
 								\
   LOCAL_TO_WIN32_FILE_FORMAT (XSTRING_DATA (path), lttff);	\
   C_STRING_TO_TSTR (lttff, out);				\
@@ -854,14 +854,14 @@
      get 7-bit ISO2022-encoded data.  We know that our internal format	   \
      is ASCII-compatible, and so these functions will work fine with	   \
      this data. */							   \
-  Intbyte *ltwffp = (path);						   \
+  Ibyte *ltwffp = (path);						   \
   if (isalpha (ltwffp[0]) && (IS_DEVICE_SEP (ltwffp[1])))		   \
     pathout = ltwffp;							   \
   else									   \
     {									   \
       int ltwff2 =							   \
         cygwin_posix_to_win32_path_list_buf_size ((char *) ltwffp);	   \
-      pathout = (Intbyte *) ALLOCA (ltwff2);				   \
+      pathout = (Ibyte *) ALLOCA (ltwff2);				   \
       cygwin_posix_to_win32_path_list ((char *) ltwffp, (char *) pathout); \
     }									   \
 } while (0)
@@ -875,10 +875,10 @@
 #ifdef CYGWIN
 #define WIN32_TO_LOCAL_FILE_FORMAT(path, pathout)			\
 do {									\
-  Intbyte *wtlff1 = (path);						\
+  Ibyte *wtlff1 = (path);						\
   int wtlff2 =								\
     cygwin_win32_to_posix_path_list_buf_size ((char *) wtlff1);		\
-  Intbyte *wtlff3 = (Intbyte *) ALLOCA (wtlff2);			\
+  Ibyte *wtlff3 = (Ibyte *) ALLOCA (wtlff2);			\
   cygwin_win32_to_posix_path_list ((char *) wtlff1, (char *) wtlff3);	\
   (pathout) = wtlff3;							\
 } while (0)
@@ -897,8 +897,8 @@
 #define LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR(lispstr, pathout)		     \
 do									     \
 {									     \
-  Intbyte *lffmutt_fname1;						     \
-  Intbyte *lffmutt_pathint = XSTRING_DATA (lispstr);			     \
+  Ibyte *lffmutt_fname1;						     \
+  Ibyte *lffmutt_pathint = XSTRING_DATA (lispstr);			     \
 									     \
   if ((lffmutt_fname1 = qxestrchr (lffmutt_pathint, ':')) != NULL	     \
       && *++lffmutt_fname1 == '/' && *++lffmutt_fname1 == '/')		     \
@@ -908,13 +908,13 @@
 	 together. */							     \
       if (qxestrncasecmp_c (lffmutt_pathint, "file://", 7) == 0)	     \
 	{								     \
-	  Intbyte *lffmutt_path1, *lffmutt_path2;			     \
+	  Ibyte *lffmutt_path1, *lffmutt_path2;			     \
 	  LOCAL_TO_WIN32_FILE_FORMAT (lffmutt_pathint + 7, lffmutt_path1);   \
 	  if (lffmutt_path1 == lffmutt_pathint + 7) /* Optimization */	     \
 	    lffmutt_path2 = lffmutt_pathint;				     \
 	  else								     \
 	    {								     \
-	      lffmutt_path2 = alloca_intbytes (7 + qxestrlen (lffmutt_path1) \
+	      lffmutt_path2 = alloca_ibytes (7 + qxestrlen (lffmutt_path1) \
 					       + 1);			     \
 	      qxestrncpy (lffmutt_path2, lffmutt_pathint, 7);		     \
 	      qxestrcpy (lffmutt_path2 + 7, lffmutt_path1);		     \
@@ -939,10 +939,10 @@
 #endif /* not CYGWIN */


-Intbyte *urlify_filename (Intbyte *filename);
-Intbyte *mswindows_canonicalize_filename (Intbyte *name);
+Ibyte *urlify_filename (Ibyte *filename);
+Ibyte *mswindows_canonicalize_filename (Ibyte *name);
 #define MSWINDOWS_NORMALIZE_FILENAME(name) \
-  INTBYTE_STRING_TO_ALLOCA (mswindows_canonicalize_filename (name), name)
+  IBYTE_STRING_TO_ALLOCA (mswindows_canonicalize_filename (name), name)

 /* ------------------- Functions needed dynamic binding ------------------- */

@@ -961,7 +961,7 @@

 typedef struct file_data
 {
-  const Intbyte  *name;
+  const Ibyte  *name;
   unsigned long  size;
   HANDLE         file;
   HANDLE         file_mapping;
@@ -980,8 +980,8 @@
 	  ((void *)(RVA_TO_OFFSET(var,section) +	\
 		    (char *)(filedata).file_base))

-int open_input_file (file_data *p_file, const Intbyte *name);
-int open_output_file (file_data *p_file, const Intbyte *name,
+int open_input_file (file_data *p_file, const Ibyte *name);
+int open_output_file (file_data *p_file, const Ibyte *name,
 		      unsigned long size);
 void close_file_data (file_data *p_file);

@@ -1037,21 +1037,21 @@
 #ifdef WIN32_NATIVE
 DECLARE_INLINE_HEADER (int strcasecmp (const char *a, const char *b))
 {
-  return qxestrcasecmp ((const Intbyte *) a, (const Intbyte *) b);
+  return qxestrcasecmp ((const Ibyte *) a, (const Ibyte *) b);
 }
 #endif /* WIN32_NATIVE */

 /* in nt.c */
-int mswindows_access (const Intbyte *path, int mode);
-int mswindows_link (const Intbyte *old, const Intbyte *new);
-int mswindows_rename (const Intbyte *oldname, const Intbyte *newname);
-int mswindows_unlink (const Intbyte *path);
-int mswindows_stat (const Intbyte *path, struct stat *buf);
+int mswindows_access (const Ibyte *path, int mode);
+int mswindows_link (const Ibyte *old, const Ibyte *new);
+int mswindows_rename (const Ibyte *oldname, const Ibyte *newname);
+int mswindows_unlink (const Ibyte *path);
+int mswindows_stat (const Ibyte *path, struct stat *buf);
 int mswindows_fstat (int desc, struct stat *buf);
 time_t mswindows_convert_time (FILETIME ft);
-void mswindows_executable_type (const Intbyte * filename, int * is_dos_app,
+void mswindows_executable_type (const Ibyte * filename, int * is_dos_app,
 				int * is_cygnus_app);
-Intbyte *mswindows_getdcwd (int drivelet);
+Ibyte *mswindows_getdcwd (int drivelet);

 /* In process-nt.c */
 extern int mswindows_compare_env (const void *strp1, const void *strp2);
--- a/src/termcap.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/termcap.c	Wed Jun 05 09:58:45 2002 +0000
@@ -380,7 +380,7 @@

   /* Here we know we must search a file and tem has its name.  */

-  fd = qxe_open ((Intbyte *) tem, 0, 0);
+  fd = qxe_open ((Ibyte *) tem, 0, 0);
   if (fd < 0)
     return -1;
--- a/src/tests.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/tests.c	Wed Jun 05 09:58:45 2002 +0000
@@ -44,7 +44,7 @@
   void *ptr; Bytecount len;
   Lisp_Object string, opaque;

-  Intbyte int_foo[] = "\n\nfoo\nbar";
+  Ibyte int_foo[] = "\n\nfoo\nbar";
   Extbyte ext_unix[]= "\n\nfoo\nbar";

   Extbyte ext_dos[] = "\r\n\r\nfoo\r\nbar";
@@ -53,8 +53,8 @@
   Lisp_Object string_foo = make_string (int_foo, sizeof (int_foo) - 1);

   Extbyte ext_latin[]  = "f\372b\343\340";
-  Intbyte int_latin1[] = "f\200\372b\200\343\200\340";
-  Intbyte int_latin2[] = "f\201\372b\201\343\201\340";
+  Ibyte int_latin1[] = "f\200\372b\200\343\200\340";
+  Ibyte int_latin2[] = "f\201\372b\201\343\201\340";
 #ifdef MULE
   Extbyte ext_latin12[]= "f\033-A\372b\343\340\033-B";
   Extbyte ext_tilde[]  = "f~b~~";
--- a/src/text.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/text.c	Wed Jun 05 09:58:45 2002 +0000
@@ -382,41 +382,41 @@

    B. Other Typedefs

-      Emchar:
+      Ichar:
       -------
         This typedef represents a single Emacs character, which can be
 	ASCII, ISO-8859, or some extended character, as would typically
 	be used for Kanji.  Note that the representation of a character
-	as an Emchar is *not* the same as the representation of that
+	as an Ichar is *not* the same as the representation of that
 	same character in a string; thus, you cannot do the standard
 	C trick of passing a pointer to a character to a function that
 	expects a string.

-	An Emchar takes up 19 bits of representation and (for code
+	An Ichar takes up 19 bits of representation and (for code
 	compatibility and such) is compatible with an int.  This
 	representation is visible on the Lisp level.  The important
-	characteristics	of the Emchar representation are
+	characteristics	of the Ichar representation are

 	  -- values 0x00 - 0x7f represent ASCII.
 	  -- values 0x80 - 0xff represent the right half of ISO-8859-1.
 	  -- values 0x100 and up represent all other characters.

-	This means that Emchar values are upwardly compatible with
+	This means that Ichar values are upwardly compatible with
 	the standard 8-bit representation of ASCII/ISO-8859-1.

-      Intbyte:
+      Ibyte:
       --------
-        The data in a buffer or string is logically made up of Intbyte
-	objects, where a Intbyte takes up the same amount of space as a
+        The data in a buffer or string is logically made up of Ibyte
+	objects, where a Ibyte takes up the same amount of space as a
 	char. (It is declared differently, though, to catch invalid
-	usages.) Strings stored using Intbytes are said to be in
+	usages.) Strings stored using Ibytes are said to be in
 	"internal format".  The important characteristics of internal
 	format are

-	  -- ASCII characters are represented as a single Intbyte,
+	  -- ASCII characters are represented as a single Ibyte,
 	     in the range 0 - 0x7f.
-	  -- All other characters are represented as a Intbyte in
-	     the range 0x80 - 0x9f followed by one or more Intbytes
+	  -- All other characters are represented as a Ibyte in
+	     the range 0x80 - 0x9f followed by one or more Ibytes
 	     in the range 0xa0 to 0xff.

 	This leads to a number of desirable properties:
@@ -632,7 +632,7 @@
 /* Most are inline functions in lisp.h */

 int
-qxesprintf (Intbyte *buffer, const CIntbyte *format, ...)
+qxesprintf (Ibyte *buffer, const CIbyte *format, ...)
 {
   va_list args;
   int retval;
@@ -645,7 +645,7 @@
 }

 /* strcasecmp() implementation from BSD */
-static Intbyte strcasecmp_charmap[] = {
+static Ibyte strcasecmp_charmap[] = {
         '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
         '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
         '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
@@ -691,9 +691,9 @@
 */

 int
-qxestrcasecmp (const Intbyte *s1, const Intbyte *s2)
+qxestrcasecmp (const Ibyte *s1, const Ibyte *s2)
 {
-  Intbyte *cm = strcasecmp_charmap;
+  Ibyte *cm = strcasecmp_charmap;

   while (cm[*s1] == cm[*s2++])
     if (*s1++ == '\0')
@@ -705,32 +705,32 @@
 int
 ascii_strcasecmp (const Char_ASCII *s1, const Char_ASCII *s2)
 {
-  return qxestrcasecmp ((const Intbyte *) s1, (const Intbyte *) s2);
+  return qxestrcasecmp ((const Ibyte *) s1, (const Ibyte *) s2);
 }

 int
-qxestrcasecmp_c (const Intbyte *s1, const Char_ASCII *s2)
+qxestrcasecmp_c (const Ibyte *s1, const Char_ASCII *s2)
 {
-  return qxestrcasecmp (s1, (const Intbyte *) s2);
+  return qxestrcasecmp (s1, (const Ibyte *) s2);
 }

 /* An internationalized version that collapses case in a general fashion.
  */

 int
-qxestrcasecmp_i18n (const Intbyte *s1, const Intbyte *s2)
+qxestrcasecmp_i18n (const Ibyte *s1, const Ibyte *s2)
 {
   while (*s1 && *s2)
     {
-      if (DOWNCASE (0, charptr_emchar (s1)) !=
-	  DOWNCASE (0, charptr_emchar (s2)))
+      if (DOWNCASE (0, itext_ichar (s1)) !=
+	  DOWNCASE (0, itext_ichar (s2)))
 	break;
-      INC_CHARPTR (s1);
-      INC_CHARPTR (s2);
+      INC_IBYTEPTR (s1);
+      INC_IBYTEPTR (s2);
     }

-  return (DOWNCASE (0, charptr_emchar (s1)) -
-	  DOWNCASE (0, charptr_emchar (s2)));
+  return (DOWNCASE (0, itext_ichar (s1)) -
+	  DOWNCASE (0, itext_ichar (s2)));
 }

 /* The only difference between these next two and
@@ -739,9 +739,9 @@
    the mem...() versions would would run off the end. */

 int
-qxestrncasecmp (const Intbyte *s1, const Intbyte *s2, Bytecount len)
+qxestrncasecmp (const Ibyte *s1, const Ibyte *s2, Bytecount len)
 {
-  Intbyte *cm = strcasecmp_charmap;
+  Ibyte *cm = strcasecmp_charmap;

   while (len--)
     {
@@ -759,13 +759,13 @@
 int
 ascii_strncasecmp (const Char_ASCII *s1, const Char_ASCII *s2, Bytecount len)
 {
-  return qxestrncasecmp ((const Intbyte *) s1, (const Intbyte *) s2, len);
+  return qxestrncasecmp ((const Ibyte *) s1, (const Ibyte *) s2, len);
 }

 int
-qxestrncasecmp_c (const Intbyte *s1, const Char_ASCII *s2, Bytecount len)
+qxestrncasecmp_c (const Ibyte *s1, const Char_ASCII *s2, Bytecount len)
 {
-  return qxestrncasecmp (s1, (const Intbyte *) s2, len);
+  return qxestrncasecmp (s1, (const Ibyte *) s2, len);
 }

 /* Compare LEN_FROM_S1 worth of characters from S1 with the same number of
@@ -775,20 +775,20 @@
    with S1. */

 int
-qxestrncasecmp_i18n (const Intbyte *s1, const Intbyte *s2,
+qxestrncasecmp_i18n (const Ibyte *s1, const Ibyte *s2,
 		     Bytecount len_from_s1)
 {
   while (len_from_s1 > 0)
     {
-      const Intbyte *old_s1 = s1;
-      int diff = (DOWNCASE (0, charptr_emchar (s1)) -
-		  DOWNCASE (0, charptr_emchar (s2)));
+      const Ibyte *old_s1 = s1;
+      int diff = (DOWNCASE (0, itext_ichar (s1)) -
+		  DOWNCASE (0, itext_ichar (s2)));
       if (diff != 0)
 	return diff;
       if (!*s1)
 	return 0;
-      INC_CHARPTR (s1);
-      INC_CHARPTR (s2);
+      INC_IBYTEPTR (s1);
+      INC_IBYTEPTR (s2);
       len_from_s1 -= s1 - old_s1;
     }

@@ -796,14 +796,14 @@
 }

 int
-qxememcmp (const Intbyte *s1, const Intbyte *s2, Bytecount len)
+qxememcmp (const Ibyte *s1, const Ibyte *s2, Bytecount len)
 {
   return memcmp (s1, s2, len);
 }

 int
-qxememcmp4 (const Intbyte *s1, Bytecount len1,
-	    const Intbyte *s2, Bytecount len2)
+qxememcmp4 (const Ibyte *s1, Bytecount len1,
+	    const Ibyte *s2, Bytecount len2)
 {
   int retval = qxememcmp (s1, s2, min (len1, len2));
   if (retval)
@@ -812,9 +812,9 @@
 }

 int
-qxememcasecmp (const Intbyte *s1, const Intbyte *s2, Bytecount len)
+qxememcasecmp (const Ibyte *s1, const Ibyte *s2, Bytecount len)
 {
-  Intbyte *cm = strcasecmp_charmap;
+  Ibyte *cm = strcasecmp_charmap;

   while (len--)
     {
@@ -828,8 +828,8 @@
 }

 int
-qxememcasecmp4 (const Intbyte *s1, Bytecount len1,
-		const Intbyte *s2, Bytecount len2)
+qxememcasecmp4 (const Ibyte *s1, Bytecount len1,
+		const Ibyte *s2, Bytecount len2)
 {
   int retval = qxememcasecmp (s1, s2, min (len1, len2));
   if (retval)
@@ -838,22 +838,22 @@
 }

 /* Do a character-by-character comparison, returning "which is greater" by
-   comparing the Emchar values. (#### Should have option to compare Unicode
+   comparing the Ichar values. (#### Should have option to compare Unicode
    points) */

 int
-qxetextcmp (const Intbyte *s1, Bytecount len1,
-	    const Intbyte *s2, Bytecount len2)
+qxetextcmp (const Ibyte *s1, Bytecount len1,
+	    const Ibyte *s2, Bytecount len2)
 {
   while (len1 > 0 && len2 > 0)
     {
-      const Intbyte *old_s1 = s1;
-      const Intbyte *old_s2 = s2;
-      int diff = charptr_emchar (s1) - charptr_emchar (s2);
+      const Ibyte *old_s1 = s1;
+      const Ibyte *old_s2 = s2;
+      int diff = itext_ichar (s1) - itext_ichar (s2);
       if (diff != 0)
 	return diff;
-      INC_CHARPTR (s1);
-      INC_CHARPTR (s2);
+      INC_IBYTEPTR (s1);
+      INC_IBYTEPTR (s2);
       len1 -= s1 - old_s1;
       len2 -= s2 - old_s2;
     }
@@ -863,20 +863,20 @@
 }

 int
-qxetextcmp_matching (const Intbyte *s1, Bytecount len1,
-		     const Intbyte *s2, Bytecount len2,
+qxetextcmp_matching (const Ibyte *s1, Bytecount len1,
+		     const Ibyte *s2, Bytecount len2,
 		     Charcount *matching)
 {
   *matching = 0;
   while (len1 > 0 && len2 > 0)
     {
-      const Intbyte *old_s1 = s1;
-      const Intbyte *old_s2 = s2;
-      int diff = charptr_emchar (s1) - charptr_emchar (s2);
+      const Ibyte *old_s1 = s1;
+      const Ibyte *old_s2 = s2;
+      int diff = itext_ichar (s1) - itext_ichar (s2);
       if (diff != 0)
 	return diff;
-      INC_CHARPTR (s1);
-      INC_CHARPTR (s2);
+      INC_IBYTEPTR (s1);
+      INC_IBYTEPTR (s2);
       len1 -= s1 - old_s1;
       len2 -= s2 - old_s2;
       (*matching)++;
@@ -887,7 +887,7 @@
 }

 /* Do a character-by-character comparison, returning "which is greater" by
-   comparing the Emchar values, case insensitively (by downcasing both
+   comparing the Ichar values, case insensitively (by downcasing both
    first). (#### Should have option to compare Unicode points)

    In this case, both lengths must be specified becaused downcasing can
@@ -897,19 +897,19 @@
    is "greater". */

 int
-qxetextcasecmp (const Intbyte *s1, Bytecount len1,
-		const Intbyte *s2, Bytecount len2)
+qxetextcasecmp (const Ibyte *s1, Bytecount len1,
+		const Ibyte *s2, Bytecount len2)
 {
   while (len1 > 0 && len2 > 0)
     {
-      const Intbyte *old_s1 = s1;
-      const Intbyte *old_s2 = s2;
-      int diff = (DOWNCASE (0, charptr_emchar (s1)) -
-		  DOWNCASE (0, charptr_emchar (s2)));
+      const Ibyte *old_s1 = s1;
+      const Ibyte *old_s2 = s2;
+      int diff = (DOWNCASE (0, itext_ichar (s1)) -
+		  DOWNCASE (0, itext_ichar (s2)));
       if (diff != 0)
 	return diff;
-      INC_CHARPTR (s1);
-      INC_CHARPTR (s2);
+      INC_IBYTEPTR (s1);
+      INC_IBYTEPTR (s2);
       len1 -= s1 - old_s1;
       len2 -= s2 - old_s2;
     }
@@ -922,21 +922,21 @@
    beginning that match. */

 int
-qxetextcasecmp_matching (const Intbyte *s1, Bytecount len1,
-			 const Intbyte *s2, Bytecount len2,
+qxetextcasecmp_matching (const Ibyte *s1, Bytecount len1,
+			 const Ibyte *s2, Bytecount len2,
 			 Charcount *matching)
 {
   *matching = 0;
   while (len1 > 0 && len2 > 0)
     {
-      const Intbyte *old_s1 = s1;
-      const Intbyte *old_s2 = s2;
-      int diff = (DOWNCASE (0, charptr_emchar (s1)) -
-		  DOWNCASE (0, charptr_emchar (s2)));
+      const Ibyte *old_s1 = s1;
+      const Ibyte *old_s2 = s2;
+      int diff = (DOWNCASE (0, itext_ichar (s1)) -
+		  DOWNCASE (0, itext_ichar (s2)));
       if (diff != 0)
 	return diff;
-      INC_CHARPTR (s1);
-      INC_CHARPTR (s2);
+      INC_IBYTEPTR (s1);
+      INC_IBYTEPTR (s2);
       len1 -= s1 - old_s1;
       len2 -= s2 - old_s2;
       (*matching)++;
@@ -949,11 +949,11 @@
 int
 lisp_strcasecmp (Lisp_Object s1, Lisp_Object s2)
 {
-  Intbyte *cm = strcasecmp_charmap;
-  Intbyte *p1 = XSTRING_DATA (s1);
-  Intbyte *p2 = XSTRING_DATA (s2);
-  Intbyte *e1 = p1 + XSTRING_LENGTH (s1);
-  Intbyte *e2 = p2 + XSTRING_LENGTH (s2);
+  Ibyte *cm = strcasecmp_charmap;
+  Ibyte *p1 = XSTRING_DATA (s1);
+  Ibyte *p2 = XSTRING_DATA (s2);
+  Ibyte *e1 = p1 + XSTRING_LENGTH (s1);
+  Ibyte *e2 = p2 + XSTRING_LENGTH (s2);

   /* again, we use a symmetric algorithm and favor clarity over
      nanosecond improvements. */
@@ -985,74 +985,74 @@
 /* NOTE: Does not reset the Dynarr. */

 void
-convert_intbyte_string_into_emchar_dynarr (const Intbyte *str, Bytecount len,
-					   Emchar_dynarr *dyn)
+convert_ibyte_string_into_ichar_dynarr (const Ibyte *str, Bytecount len,
+					   Ichar_dynarr *dyn)
 {
-  const Intbyte *strend = str + len;
+  const Ibyte *strend = str + len;

   while (str < strend)
     {
-      Emchar ch = charptr_emchar (str);
+      Ichar ch = itext_ichar (str);
       Dynarr_add (dyn, ch);
-      INC_CHARPTR (str);
+      INC_IBYTEPTR (str);
     }
 }

 Charcount
-convert_intbyte_string_into_emchar_string (const Intbyte *str, Bytecount len,
-					   Emchar *arr)
+convert_ibyte_string_into_ichar_string (const Ibyte *str, Bytecount len,
+					   Ichar *arr)
 {
-  const Intbyte *strend = str + len;
+  const Ibyte *strend = str + len;
   Charcount newlen = 0;
   while (str < strend)
     {
-      Emchar ch = charptr_emchar (str);
+      Ichar ch = itext_ichar (str);
       arr[newlen++] = ch;
-      INC_CHARPTR (str);
+      INC_IBYTEPTR (str);
     }
   return newlen;
 }

-/* Convert an array of Emchars into the equivalent string representation.
-   Store into the given Intbyte dynarr.  Does not reset the dynarr.
+/* Convert an array of Ichars into the equivalent string representation.
+   Store into the given Ibyte dynarr.  Does not reset the dynarr.
    Does not add a terminating zero. */

 void
-convert_emchar_string_into_intbyte_dynarr (Emchar *arr, int nels,
-					  Intbyte_dynarr *dyn)
+convert_ichar_string_into_ibyte_dynarr (Ichar *arr, int nels,
+					  Ibyte_dynarr *dyn)
 {
-  Intbyte str[MAX_EMCHAR_LEN];
+  Ibyte str[MAX_ICHAR_LEN];
   int i;

   for (i = 0; i < nels; i++)
     {
-      Bytecount len = set_charptr_emchar (str, arr[i]);
+      Bytecount len = set_itext_ichar (str, arr[i]);
       Dynarr_add_many (dyn, str, len);
     }
 }

-/* Convert an array of Emchars into the equivalent string representation.
+/* Convert an array of Ichars into the equivalent string representation.
    Malloc the space needed for this and return it.  If LEN_OUT is not a
-   NULL pointer, store into LEN_OUT the number of Intbytes in the
-   malloc()ed string.  Note that the actual number of Intbytes allocated
+   NULL pointer, store into LEN_OUT the number of Ibytes in the
+   malloc()ed string.  Note that the actual number of Ibytes allocated
    is one more than this: the returned string is zero-terminated. */

-Intbyte *
-convert_emchar_string_into_malloced_string (Emchar *arr, int nels,
+Ibyte *
+convert_ichar_string_into_malloced_string (Ichar *arr, int nels,
 					    Bytecount *len_out)
 {
   /* Damn zero-termination. */
-  Intbyte *str = (Intbyte *) ALLOCA (nels * MAX_EMCHAR_LEN + 1);
-  Intbyte *strorig = str;
+  Ibyte *str = (Ibyte *) ALLOCA (nels * MAX_ICHAR_LEN + 1);
+  Ibyte *strorig = str;
   Bytecount len;

   int i;

   for (i = 0; i < nels; i++)
-    str += set_charptr_emchar (str, arr[i]);
+    str += set_itext_ichar (str, arr[i]);
   *str = '\0';
   len = str - strorig;
-  str = (Intbyte *) xmalloc (1 + len);
+  str = (Ibyte *) xmalloc (1 + len);
   memcpy (str, strorig, 1 + len);
   if (len_out)
     *len_out = len;
@@ -1064,24 +1064,24 @@
 {									 \
   if (dst)								 \
     {									 \
-      Intbyte *dstend = dst + dstlen;					 \
-      Intbyte *dstp = dst;						 \
-      const Intbyte *srcend = src + srclen;				 \
-      const Intbyte *srcp = src;					 \
+      Ibyte *dstend = dst + dstlen;					 \
+      Ibyte *dstp = dst;						 \
+      const Ibyte *srcend = src + srclen;				 \
+      const Ibyte *srcp = src;					 \
 									 \
       while (srcp < srcend)						 \
 	{								 \
-	  Emchar ch = charptr_emchar_fmt (srcp, srcfmt, srcobj);	 \
-	  Bytecount len = emchar_len_fmt (ch, dstfmt);			 \
+	  Ichar ch = itext_ichar_fmt (srcp, srcfmt, srcobj);	 \
+	  Bytecount len = ichar_len_fmt (ch, dstfmt);			 \
 									 \
 	    if (dstp + len <= dstend)					 \
 	      {								 \
-		set_charptr_emchar_fmt (dstp, ch, dstfmt, dstobj);	 \
+		set_itext_ichar_fmt (dstp, ch, dstfmt, dstobj);	 \
 		dstp += len;						 \
 	      }								 \
 	    else							 \
 	      break;							 \
-	  INC_CHARPTR_FMT (srcp, srcfmt);				 \
+	  INC_IBYTEPTR_FMT (srcp, srcfmt);				 \
 	}								 \
       text_checking_assert (srcp <= srcend);				 \
       if (src_used)							 \
@@ -1090,15 +1090,15 @@
     }									 \
   else									 \
     {									 \
-      const Intbyte *srcend = src + srclen;				 \
-      const Intbyte *srcp = src;					 \
+      const Ibyte *srcend = src + srclen;				 \
+      const Ibyte *srcp = src;					 \
       Bytecount total = 0;						 \
 									 \
       while (srcp < srcend)						 \
 	{								 \
-	  total += emchar_len_fmt (charptr_emchar_fmt (srcp, srcfmt,	 \
+	  total += ichar_len_fmt (itext_ichar_fmt (srcp, srcfmt,	 \
 						       srcobj), dstfmt); \
-	  INC_CHARPTR_FMT (srcp, srcfmt);				 \
+	  INC_IBYTEPTR_FMT (srcp, srcfmt);				 \
 	}								 \
       text_checking_assert (srcp == srcend);				 \
       if (src_used)							 \
@@ -1116,10 +1116,10 @@
    partial characters into DST. */

 Bytecount
-copy_text_between_formats (const Intbyte *src, Bytecount srclen,
+copy_text_between_formats (const Ibyte *src, Bytecount srclen,
 			   Internal_Format srcfmt,
 			   Lisp_Object srcobj,
-			   Intbyte *dst, Bytecount dstlen,
+			   Ibyte *dst, Bytecount dstlen,
 			   Internal_Format dstfmt,
 			   Lisp_Object dstobj,
 			   Bytecount *src_used)
@@ -1130,7 +1130,7 @@
       if (dst)
 	{
 	  srclen = min (srclen, dstlen);
-	  srclen = validate_intbyte_string_backward (src, srclen);
+	  srclen = validate_ibyte_string_backward (src, srclen);
 	  memcpy (dst, src, srclen);
 	  if (src_used)
 	    *src_used = srclen;
@@ -1164,7 +1164,7 @@

 Bytecount
 copy_buffer_text_out (struct buffer *buf, Bytebpos pos,
-		      Bytecount len, Intbyte *dst, Bytecount dstlen,
+		      Bytecount len, Ibyte *dst, Bytecount dstlen,
 		      Internal_Format dstfmt, Lisp_Object dstobj,
 		      Bytecount *src_used)
 {
@@ -1213,14 +1213,14 @@
 /************************************************************************/

 void
-find_charsets_in_intbyte_string (unsigned char *charsets, const Intbyte *str,
+find_charsets_in_ibyte_string (unsigned char *charsets, const Ibyte *str,
 				 Bytecount len)
 {
 #ifndef MULE
   /* Telescope this. */
   charsets[0] = 1;
 #else
-  const Intbyte *strend = str + len;
+  const Ibyte *strend = str + len;
   memset (charsets, 0, NUM_LEADING_BYTES);

   /* #### SJT doesn't like this. */
@@ -1232,15 +1232,15 @@

   while (str < strend)
     {
-      charsets[emchar_leading_byte (charptr_emchar (str)) - MIN_LEADING_BYTE] =
+      charsets[ichar_leading_byte (itext_ichar (str)) - MIN_LEADING_BYTE] =
 	1;
-      INC_CHARPTR (str);
+      INC_IBYTEPTR (str);
     }
 #endif
 }

 void
-find_charsets_in_emchar_string (unsigned char *charsets, const Emchar *str,
+find_charsets_in_ichar_string (unsigned char *charsets, const Ichar *str,
 				Charcount len)
 {
 #ifndef MULE
@@ -1260,40 +1260,40 @@

   for (i = 0; i < len; i++)
     {
-      charsets[emchar_leading_byte (str[i]) - MIN_LEADING_BYTE] = 1;
+      charsets[ichar_leading_byte (str[i]) - MIN_LEADING_BYTE] = 1;
     }
 #endif
 }

 int
-intbyte_string_displayed_columns (const Intbyte *str, Bytecount len)
+ibyte_string_displayed_columns (const Ibyte *str, Bytecount len)
 {
   int cols = 0;
-  const Intbyte *end = str + len;
+  const Ibyte *end = str + len;

   while (str < end)
     {
 #ifdef MULE
-      Emchar ch = charptr_emchar (str);
-      cols += XCHARSET_COLUMNS (emchar_charset (ch));
+      Ichar ch = itext_ichar (str);
+      cols += XCHARSET_COLUMNS (ichar_charset (ch));
 #else
       cols++;
 #endif
-      INC_CHARPTR (str);
+      INC_IBYTEPTR (str);
     }

   return cols;
 }

 int
-emchar_string_displayed_columns (const Emchar *str, Charcount len)
+ichar_string_displayed_columns (const Ichar *str, Charcount len)
 {
 #ifdef MULE
   int cols = 0;
   int i;

   for (i = 0; i < len; i++)
-    cols += XCHARSET_COLUMNS (emchar_charset (str[i]));
+    cols += XCHARSET_COLUMNS (ichar_charset (str[i]));

   return cols;
 #else  /* not MULE */
@@ -1302,17 +1302,17 @@
 }

 Charcount
-intbyte_string_nonascii_chars (const Intbyte *str, Bytecount len)
+ibyte_string_nonascii_chars (const Ibyte *str, Bytecount len)
 {
 #ifdef MULE
-  const Intbyte *end = str + len;
+  const Ibyte *end = str + len;
   Charcount retval = 0;

   while (str < end)
     {
       if (!byte_ascii_p (*str))
 	retval++;
-      INC_CHARPTR (str);
+      INC_IBYTEPTR (str);
     }

   return retval;
@@ -1327,17 +1327,17 @@
 /***************************************************************************/

 int
-eistr_casefiddle_1 (Intbyte *olddata, Bytecount len, Intbyte *newdata,
+eistr_casefiddle_1 (Ibyte *olddata, Bytecount len, Ibyte *newdata,
 		    int downp)
 {
-  Intbyte *endp = olddata + len;
-  Intbyte *newp = newdata;
+  Ibyte *endp = olddata + len;
+  Ibyte *newp = newdata;
   int changedp = 0;

   while (olddata < endp)
     {
-      Emchar c = charptr_emchar (olddata);
-      Emchar newc;
+      Ichar c = itext_ichar (olddata);
+      Ichar newc;

       if (downp)
 	newc = DOWNCASE (0, c);
@@ -1347,8 +1347,8 @@
       if (c != newc)
 	changedp = 1;

-      newp += set_charptr_emchar (newp, newc);
-      INC_CHARPTR (olddata);
+      newp += set_itext_ichar (newp, newc);
+      INC_IBYTEPTR (olddata);
     }

   *newp = '\0';
@@ -1376,11 +1376,11 @@
   ei->mallocp_ = 1;
   if (ei->data_)
     {
-      Intbyte *newdata;
+      Ibyte *newdata;

       ei->max_size_allocated_ =
 	eifind_large_enough_buffer (0, ei->bytelen_ + 1);
-      newdata = (Intbyte *) xmalloc (ei->max_size_allocated_);
+      newdata = (Ibyte *) xmalloc (ei->max_size_allocated_);
       memcpy (newdata, ei->data_, ei->bytelen_ + 1);
       ei->data_ = newdata;
     }
@@ -1399,7 +1399,7 @@

 int
 eicmp_1 (Eistring *ei, Bytecount off, Charcount charoff,
-	 Bytecount len, Charcount charlen, const Intbyte *data,
+	 Bytecount len, Charcount charlen, const Ibyte *data,
 	 const Eistring *ei2, int is_c, int fold_case)
 {
   assert ((off < 0) != (charoff < 0));
@@ -1422,7 +1422,7 @@

   {
     Bytecount dstlen;
-    const Intbyte *src = ei->data_, *dst;
+    const Ibyte *src = ei->data_, *dst;

     if (data)
       {
@@ -1444,14 +1444,14 @@
   }
 }

-Intbyte *
+Ibyte *
 eicpyout_malloc_fmt (Eistring *eistr, Bytecount *len_out, Internal_Format fmt,
 		     Lisp_Object object)
 {
-  Intbyte *ptr;
+  Ibyte *ptr;

   assert (fmt == FORMAT_DEFAULT);
-  ptr = xnew_array (Intbyte, eistr->bytelen_ + 1);
+  ptr = xnew_array (Ibyte, eistr->bytelen_ + 1);
   if (len_out)
     *len_out = eistr->bytelen_;
   memcpy (ptr, eistr->data_, eistr->bytelen_ + 1);
@@ -1470,8 +1470,8 @@
 /* Skip as many ASCII bytes as possible in the memory block [PTR, END).
    Return pointer to the first non-ASCII byte.  optimized for long
    stretches of ASCII. */
-inline static const Intbyte *
-skip_ascii (const Intbyte *ptr, const Intbyte *end)
+inline static const Ibyte *
+skip_ascii (const Ibyte *ptr, const Ibyte *end)
 {
 #ifdef EFFICIENT_INT_128_BIT
 # define STRIDE_TYPE INT_128_BIT
@@ -1503,10 +1503,10 @@
   ascii_end = (const unsigned STRIDE_TYPE *) ptr;
   /* This loop screams, because we can detect ASCII
      characters 4 or 8 at a time. */
-  while ((const Intbyte *) ascii_end + STRIDE <= end
+  while ((const Ibyte *) ascii_end + STRIDE <= end
 	 && !(*ascii_end & HIGH_BIT_MASK))
     ascii_end++;
-  ptr = (Intbyte *) ascii_end;
+  ptr = (Ibyte *) ascii_end;
   while (ptr < end && byte_ascii_p (*ptr))
     ptr++;
   return ptr;
@@ -1518,20 +1518,20 @@
    strings. */

 Charcount
-bytecount_to_charcount_fun (const Intbyte *ptr, Bytecount len)
+bytecount_to_charcount_fun (const Ibyte *ptr, Bytecount len)
 {
   Charcount count = 0;
-  const Intbyte *end = ptr + len;
+  const Ibyte *end = ptr + len;
   while (1)
     {
-      const Intbyte *newptr = skip_ascii (ptr, end);
+      const Ibyte *newptr = skip_ascii (ptr, end);
       count += newptr - ptr;
       ptr = newptr;
       if (ptr == end)
 	break;
       {
 	/* Optimize for successive characters from the same charset */
-	Intbyte leading_byte = *ptr;
+	Ibyte leading_byte = *ptr;
 	int bytes = rep_bytes_by_first_byte (leading_byte);
 	while (ptr < end && *ptr == leading_byte)
 	  ptr += bytes, count++;
@@ -1550,19 +1550,19 @@
 }

 Bytecount
-charcount_to_bytecount_fun (const Intbyte *ptr, Charcount len)
+charcount_to_bytecount_fun (const Ibyte *ptr, Charcount len)
 {
-  const Intbyte *newptr = ptr;
+  const Ibyte *newptr = ptr;
   while (1)
     {
-      const Intbyte *newnewptr = skip_ascii (newptr, newptr + len);
+      const Ibyte *newnewptr = skip_ascii (newptr, newptr + len);
       len -= newnewptr - newptr;
       newptr = newnewptr;
       if (!len)
 	break;
       {
 	/* Optimize for successive characters from the same charset */
-	Intbyte leading_byte = *newptr;
+	Ibyte leading_byte = *newptr;
 	int bytes = rep_bytes_by_first_byte (leading_byte);
 	while (len > 0 && *newptr == leading_byte)
 	  newptr += bytes, len--;
@@ -2735,8 +2735,8 @@

 typedef struct
 {
-  Dynarr_declare (Intbyte_dynarr *);
-} Intbyte_dynarr_dynarr;
+  Dynarr_declare (Ibyte_dynarr *);
+} Ibyte_dynarr_dynarr;

 typedef struct
 {
@@ -2744,7 +2744,7 @@
 } Extbyte_dynarr_dynarr;

 static Extbyte_dynarr_dynarr *conversion_out_dynarr_list;
-static Intbyte_dynarr_dynarr *conversion_in_dynarr_list;
+static Ibyte_dynarr_dynarr *conversion_in_dynarr_list;

 static int dfc_convert_to_external_format_in_use;
 static int dfc_convert_to_internal_format_in_use;
@@ -2791,7 +2791,7 @@
       sink_type   != DFC_TYPE_LISP_LSTREAM &&
       coding_system_is_binary (coding_system))
     {
-      const Intbyte *ptr;
+      const Ibyte *ptr;
       Bytecount len;

       if (source_type == DFC_TYPE_LISP_STRING)
@@ -2801,23 +2801,23 @@
 	}
       else
 	{
-	  ptr = (Intbyte *) source->data.ptr;
+	  ptr = (Ibyte *) source->data.ptr;
 	  len = source->data.len;
 	}

 #ifdef MULE
       {
-	const Intbyte *end;
+	const Ibyte *end;
 	for (end = ptr + len; ptr < end;)
 	  {
-	    Intbyte c =
+	    Ibyte c =
 	      (byte_ascii_p (*ptr))		   ? *ptr :
 	      (*ptr == LEADING_BYTE_CONTROL_1)	   ? (*(ptr+1) - 0x20) :
 	      (*ptr == LEADING_BYTE_LATIN_ISO8859_1) ? (*(ptr+1)) :
 	      '~';

 	    Dynarr_add (conversion_out_dynarr, (Extbyte) c);
-	    INC_CHARPTR (ptr);
+	    INC_IBYTEPTR (ptr);
 	  }
 	text_checking_assert (ptr == end);
       }
@@ -2832,9 +2832,9 @@
 	   sink_type   != DFC_TYPE_LISP_LSTREAM &&
 	   dfc_coding_system_is_unicode (coding_system))
     {
-      const Intbyte *ptr, *p;
+      const Ibyte *ptr, *p;
       Bytecount len;
-      const Intbyte *end;
+      const Ibyte *end;

       if (source_type == DFC_TYPE_LISP_STRING)
 	{
@@ -2843,7 +2843,7 @@
 	}
       else
 	{
-	  ptr = (Intbyte *) source->data.ptr;
+	  ptr = (Ibyte *) source->data.ptr;
 	  len = source->data.len;
 	}
       end = ptr + len;
@@ -2956,7 +2956,7 @@
      esp. given that this code conversion occurs in many very hidden
      places. */
   int count = begin_gc_forbidden ();
-  Intbyte_dynarr *conversion_in_dynarr;
+  Ibyte_dynarr *conversion_in_dynarr;

   type_checking_assert
     ((source_type == DFC_TYPE_DATA ||
@@ -2967,7 +2967,7 @@

   if (Dynarr_length (conversion_in_dynarr_list) <=
       dfc_convert_to_internal_format_in_use)
-    Dynarr_add (conversion_in_dynarr_list, Dynarr_new (Intbyte));
+    Dynarr_add (conversion_in_dynarr_list, Dynarr_new (Ibyte));
   conversion_in_dynarr = Dynarr_at (conversion_in_dynarr_list,
 				    dfc_convert_to_internal_format_in_use);
   Dynarr_reset (conversion_in_dynarr);
@@ -2982,13 +2982,13 @@
       coding_system_is_binary (coding_system))
     {
 #ifdef MULE
-      const Intbyte *ptr = (const Intbyte *) source->data.ptr;
+      const Ibyte *ptr = (const Ibyte *) source->data.ptr;
       Bytecount len = source->data.len;
-      const Intbyte *end = ptr + len;
+      const Ibyte *end = ptr + len;

       for (; ptr < end; ptr++)
         {
-          Intbyte c = *ptr;
+          Ibyte c = *ptr;

 	  if (byte_ascii_p (c))
 	    Dynarr_add (conversion_in_dynarr, c);
@@ -3013,9 +3013,9 @@
 	   sink_type   != DFC_TYPE_LISP_LSTREAM &&
 	   dfc_coding_system_is_unicode (coding_system))
     {
-      const Intbyte *ptr = (const Intbyte *) source->data.ptr + 1;
+      const Ibyte *ptr = (const Ibyte *) source->data.ptr + 1;
       Bytecount len = source->data.len;
-      const Intbyte *end = ptr + len;
+      const Ibyte *end = ptr + len;

       if (len & 1)
 	goto the_hard_way;
@@ -3026,12 +3026,12 @@
 	    goto the_hard_way;
 	}

-      ptr = (const Intbyte *) source->data.ptr;
+      ptr = (const Ibyte *) source->data.ptr;
       end = ptr + len;

       for (; ptr < end; ptr += 2)
 	{
-          Intbyte c = *ptr;
+          Ibyte c = *ptr;

 	  if (byte_ascii_p (c))
 	    Dynarr_add (conversion_in_dynarr, c);
@@ -3135,27 +3135,27 @@


 /************************************************************************/
-/*                       Basic Emchar functions                         */
+/*                       Basic Ichar functions                         */
 /************************************************************************/

 #ifdef MULE

 /* Convert a non-ASCII Mule character C into a one-character Mule-encoded
    string in STR.  Returns the number of bytes stored.
-   Do not call this directly.  Use the macro set_charptr_emchar() instead.
+   Do not call this directly.  Use the macro set_itext_ichar() instead.
  */

 Bytecount
-non_ascii_set_charptr_emchar (Intbyte *str, Emchar c)
+non_ascii_set_itext_ichar (Ibyte *str, Ichar c)
 {
-  Intbyte *p;
-  Intbyte lb;
+  Ibyte *p;
+  Ibyte lb;
   int c1, c2;
   Lisp_Object charset;

   p = str;
-  BREAKUP_EMCHAR (c, charset, c1, c2);
-  lb = emchar_leading_byte (c);
+  BREAKUP_ICHAR (c, charset, c1, c2);
+  lb = ichar_leading_byte (c);
   if (leading_byte_private_p (lb))
     *p++ = private_leading_byte_prefix (lb);
   *p++ = lb;
@@ -3170,16 +3170,16 @@

 /* Return the first character from a Mule-encoded string in STR,
    assuming it's non-ASCII.  Do not call this directly.
-   Use the macro charptr_emchar() instead. */
-
-Emchar
-non_ascii_charptr_emchar (const Intbyte *str)
+   Use the macro itext_ichar() instead. */
+
+Ichar
+non_ascii_itext_ichar (const Ibyte *str)
 {
-  Intbyte i0 = *str, i1, i2 = 0;
+  Ibyte i0 = *str, i1, i2 = 0;
   Lisp_Object charset;

   if (i0 == LEADING_BYTE_CONTROL_1)
-    return (Emchar) (*++str - 0x20);
+    return (Ichar) (*++str - 0x20);

   if (leading_byte_prefix_p (i0))
     i0 = *++str;
@@ -3190,14 +3190,14 @@
   if (XCHARSET_DIMENSION (charset) == 2)
     i2 = *++str & 0x7F;

-  return make_emchar (charset, i1, i2);
+  return make_ichar (charset, i1, i2);
 }

-/* Return whether CH is a valid Emchar, assuming it's non-ASCII.
-   Do not call this directly.  Use the macro valid_emchar_p() instead. */
+/* Return whether CH is a valid Ichar, assuming it's non-ASCII.
+   Do not call this directly.  Use the macro valid_ichar_p() instead. */

 int
-non_ascii_valid_emchar_p (Emchar ch)
+non_ascii_valid_ichar_p (Ichar ch)
 {
   int f1, f2, f3;

@@ -3205,9 +3205,9 @@
   if (ch & ~0x7FFFF)
     return 0;

-  f1 = emchar_field1 (ch);
-  f2 = emchar_field2 (ch);
-  f3 = emchar_field3 (ch);
+  f1 = ichar_field1 (ch);
+  f2 = ichar_field2 (ch);
+  f3 = ichar_field3 (ch);

   if (f1 == 0)
     {
@@ -3215,9 +3215,9 @@
       Lisp_Object charset;

       /* leading byte must be correct */
-      if (f2 < MIN_EMCHAR_FIELD2_OFFICIAL ||
-	  (f2 > MAX_EMCHAR_FIELD2_OFFICIAL && f2 < MIN_EMCHAR_FIELD2_PRIVATE) ||
-	   f2 > MAX_EMCHAR_FIELD2_PRIVATE)
+      if (f2 < MIN_ICHAR_FIELD2_OFFICIAL ||
+	  (f2 > MAX_ICHAR_FIELD2_OFFICIAL && f2 < MIN_ICHAR_FIELD2_PRIVATE) ||
+	   f2 > MAX_ICHAR_FIELD2_PRIVATE)
 	return 0;
       /* octet not out of range */
       if (f3 < 0x20)
@@ -3240,9 +3240,9 @@
       Lisp_Object charset;

       /* leading byte must be correct */
-      if (f1 < MIN_EMCHAR_FIELD1_OFFICIAL ||
-	  (f1 > MAX_EMCHAR_FIELD1_OFFICIAL && f1 < MIN_EMCHAR_FIELD1_PRIVATE) ||
-	  f1 > MAX_EMCHAR_FIELD1_PRIVATE)
+      if (f1 < MIN_ICHAR_FIELD1_OFFICIAL ||
+	  (f1 > MAX_ICHAR_FIELD1_OFFICIAL && f1 < MIN_ICHAR_FIELD1_PRIVATE) ||
+	  f1 > MAX_ICHAR_FIELD1_PRIVATE)
 	return 0;
       /* octets not out of range */
       if (f2 < 0x20 || f3 < 0x20)
@@ -3260,7 +3260,7 @@
 #endif /* ENABLE_COMPOSITE_CHARS */

       /* charset exists */
-      if (f1 <= MAX_EMCHAR_FIELD1_OFFICIAL)
+      if (f1 <= MAX_ICHAR_FIELD1_OFFICIAL)
 	charset =
 	  charset_by_leading_byte (f1 + FIELD1_TO_OFFICIAL_LEADING_BYTE);
       else
@@ -3276,11 +3276,11 @@
 }

 /* Copy the character pointed to by SRC into DST.  Do not call this
-   directly.  Use the macro charptr_copy_emchar() instead.
+   directly.  Use the macro itext_copy_ichar() instead.
    Return the number of bytes copied.  */

 Bytecount
-non_ascii_charptr_copy_emchar (const Intbyte *src, Intbyte *dst)
+non_ascii_itext_copy_ichar (const Ibyte *src, Ibyte *dst)
 {
   Bytecount bytes = rep_bytes_by_first_byte (*src);
   Bytecount i;
@@ -3293,46 +3293,46 @@


 /************************************************************************/
-/*                        streams of Emchars                            */
+/*                        streams of Ichars                            */
 /************************************************************************/

 #ifdef MULE

-/* Treat a stream as a stream of Emchar's rather than a stream of bytes.
+/* Treat a stream as a stream of Ichar's rather than a stream of bytes.
    The functions below are not meant to be called directly; use
    the macros in insdel.h. */

-Emchar
-Lstream_get_emchar_1 (Lstream *stream, int ch)
+Ichar
+Lstream_get_ichar_1 (Lstream *stream, int ch)
 {
-  Intbyte str[MAX_EMCHAR_LEN];
-  Intbyte *strptr = str;
+  Ibyte str[MAX_ICHAR_LEN];
+  Ibyte *strptr = str;
   Bytecount bytes;

-  str[0] = (Intbyte) ch;
+  str[0] = (Ibyte) ch;

   for (bytes = rep_bytes_by_first_byte (ch) - 1; bytes; bytes--)
     {
       int c = Lstream_getc (stream);
       text_checking_assert (c >= 0);
-      *++strptr = (Intbyte) c;
+      *++strptr = (Ibyte) c;
     }
-  return charptr_emchar (str);
+  return itext_ichar (str);
 }

 int
-Lstream_fput_emchar (Lstream *stream, Emchar ch)
+Lstream_fput_ichar (Lstream *stream, Ichar ch)
 {
-  Intbyte str[MAX_EMCHAR_LEN];
-  Bytecount len = set_charptr_emchar (str, ch);
+  Ibyte str[MAX_ICHAR_LEN];
+  Bytecount len = set_itext_ichar (str, ch);
   return Lstream_write (stream, str, len);
 }

 void
-Lstream_funget_emchar (Lstream *stream, Emchar ch)
+Lstream_funget_ichar (Lstream *stream, Ichar ch)
 {
-  Intbyte str[MAX_EMCHAR_LEN];
-  Bytecount len = set_charptr_emchar (str, ch);
+  Ibyte str[MAX_ICHAR_LEN];
+  Bytecount len = set_itext_ichar (str, ch);
   Lstream_unread (stream, str, len);
 }

@@ -3438,7 +3438,7 @@
       if (!NILP (arg2))
         invalid_argument
           ("Charset is of dimension one; second octet must be nil", arg2);
-      return make_char (make_emchar (charset, a1, 0));
+      return make_char (make_ichar (charset, a1, 0));
     }

   CHECK_INT (arg2);
@@ -3446,7 +3446,7 @@
   if (a2 < lowlim || a2 > highlim)
     args_out_of_range_3 (arg2, make_int (lowlim), make_int (highlim));

-  return make_char (make_emchar (charset, a1, a2));
+  return make_char (make_ichar (charset, a1, a2));
 #else
   int a1;
   int lowlim, highlim;
@@ -3480,7 +3480,7 @@
   CHECK_CHAR_COERCE_INT (ch);

   return XCHARSET_NAME (charset_by_leading_byte
-			(emchar_leading_byte (XCHAR (ch))));
+			(ichar_leading_byte (XCHAR (ch))));
 }

 DEFUN ("char-octet", Fchar_octet, 1, 2, 0, /*
@@ -3494,7 +3494,7 @@

   CHECK_CHAR_COERCE_INT (ch);

-  BREAKUP_EMCHAR (XCHAR (ch), charset, octet0, octet1);
+  BREAKUP_ICHAR (XCHAR (ch), charset, octet0, octet1);

   if (NILP (n) || EQ (n, Qzero))
     return make_int (octet0);
@@ -3518,7 +3518,7 @@
   GCPRO2 (charset, rc);
   CHECK_CHAR_COERCE_INT (character);

-  BREAKUP_EMCHAR (XCHAR (character), charset, c1, c2);
+  BREAKUP_ICHAR (XCHAR (character), charset, c1, c2);

   if (XCHARSET_DIMENSION (Fget_charset (charset)) == 2)
     {
@@ -3542,20 +3542,20 @@

 #ifdef ENABLE_COMPOSITE_CHARS

-Emchar
-lookup_composite_char (Intbyte *str, int len)
+Ichar
+lookup_composite_char (Ibyte *str, int len)
 {
   Lisp_Object lispstr = make_string (str, len);
   Lisp_Object ch = Fgethash (lispstr,
 			     Vcomposite_char_string2char_hash_table,
 			     Qunbound);
-  Emchar emch;
+  Ichar emch;

   if (UNBOUNDP (ch))
     {
       if (composite_char_row_next >= 128)
 	invalid_operation ("No more composite chars available", lispstr);
-      emch = make_emchar (Vcharset_composite, composite_char_row_next,
+      emch = make_ichar (Vcharset_composite, composite_char_row_next,
 			composite_char_col_next);
       Fputhash (make_char (emch), lispstr,
 	        Vcomposite_char_char2string_hash_table);
@@ -3574,7 +3574,7 @@
 }

 Lisp_Object
-composite_char_string (Emchar ch)
+composite_char_string (Ichar ch)
 {
   Lisp_Object str = Fgethash (make_char (ch),
 			      Vcomposite_char_char2string_hash_table,
@@ -3600,11 +3600,11 @@
 */
        (ch))
 {
-  Emchar emch;
+  Ichar emch;

   CHECK_CHAR (ch);
   emch = XCHAR (ch);
-  if (emchar_leading_byte (emch) != LEADING_BYTE_COMPOSITE)
+  if (ichar_leading_byte (emch) != LEADING_BYTE_COMPOSITE)
     invalid_argument ("Must be composite char", ch);
   return composite_char_string (emch);
 }
@@ -3650,8 +3650,8 @@
 {
   int i;

-  conversion_in_dynarr_list = Dynarr_new2 (Intbyte_dynarr_dynarr,
-					   Intbyte_dynarr *);
+  conversion_in_dynarr_list = Dynarr_new2 (Ibyte_dynarr_dynarr,
+					   Ibyte_dynarr *);
   conversion_out_dynarr_list = Dynarr_new2 (Extbyte_dynarr_dynarr,
 					    Extbyte_dynarr *);
--- a/src/text.h	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/text.h	Wed Jun 05 09:58:45 2002 +0000
@@ -54,7 +54,7 @@

 #define rep_bytes_by_first_byte(fb) 1
 #define byte_ascii_p(byte) 1
-#define MAX_EMCHAR_LEN 1
+#define MAX_ICHAR_LEN 1

 #else /* MULE */

@@ -71,19 +71,19 @@

 DECLARE_INLINE_HEADER (
 int
-intbyte_first_byte_p_1 (int byte, const char *file, int line)
+ibyte_first_byte_p_1 (int byte, const char *file, int line)
 )
 {
   assert_at_line (byte >= 0 && byte < 256, file, line);
   return byte < 0xA0;
 }

-#define intbyte_first_byte_p(byte) \
-  intbyte_first_byte_p_1 (byte, __FILE__, __LINE__)
+#define ibyte_first_byte_p(byte) \
+  ibyte_first_byte_p_1 (byte, __FILE__, __LINE__)

 #else

-#define intbyte_first_byte_p(byte) ((byte) < 0xA0)
+#define ibyte_first_byte_p(byte) ((byte) < 0xA0)

 #endif

@@ -93,19 +93,19 @@

 DECLARE_INLINE_HEADER (
 int
-intbyte_leading_byte_p_1 (int byte, const char *file, int line)
+ibyte_leading_byte_p_1 (int byte, const char *file, int line)
 )
 {
   assert_at_line (byte >= 0 && byte < 256, file, line);
   return byte_c1_p (byte);
 }

-#define intbyte_leading_byte_p(byte) \
-  intbyte_leading_byte_p_1 (byte, __FILE__, __LINE__)
+#define ibyte_leading_byte_p(byte) \
+  ibyte_leading_byte_p_1 (byte, __FILE__, __LINE__)

 #else

-#define intbyte_leading_byte_p(byte) byte_c1_p (byte)
+#define ibyte_leading_byte_p(byte) byte_c1_p (byte)

 #endif

@@ -142,15 +142,15 @@
 /* Is this character represented by more than one byte in a string in the
    default format? */

-#define emchar_multibyte_p(c) ((c) >= 0x80)
-
-#define emchar_ascii_p(c) (!emchar_multibyte_p (c))
+#define ichar_multibyte_p(c) ((c) >= 0x80)
+
+#define ichar_ascii_p(c) (!ichar_multibyte_p (c))

 /* Maximum number of bytes per Emacs character when represented as text, in
  any format.
  */

-#define MAX_EMCHAR_LEN 4
+#define MAX_ICHAR_LEN 4

 #endif /* not MULE */

@@ -182,7 +182,7 @@

    Currently we support only the default format and the 8-bit fixed format,
    and in the latter, we only allow these to be the first 256 characters in
-   an Emchar (ASCII and Latin 1).
+   an Ichar (ASCII and Latin 1).

    One reasonable approach for 8-bit fixed is to allow the upper half to
    represent any 1-byte charset, which is specified on a per-buffer basis.
@@ -235,23 +235,23 @@
    values may depend on the buffer, e.g. depending on what language the
    text in the buffer is in. */

-/* True if Emchar CH can be represented in 8-bit-fixed format. */
-#define emchar_8_bit_fixed_p(ch, object)   (((ch) & ~0xff) == 0)
-/* Convert Emchar CH to an 8-bit int, as will be stored in the buffer. */
-#define emchar_to_raw_8_bit_fixed(ch, object) ((Intbyte) (ch))
+/* True if Ichar CH can be represented in 8-bit-fixed format. */
+#define ichar_8_bit_fixed_p(ch, object)   (((ch) & ~0xff) == 0)
+/* Convert Ichar CH to an 8-bit int, as will be stored in the buffer. */
+#define ichar_to_raw_8_bit_fixed(ch, object) ((Ibyte) (ch))
 /* Convert the other way. */
-#define raw_8_bit_fixed_to_emchar(ch, object) ((Emchar) (ch))
-
-#define emchar_16_bit_fixed_p(ch, object)   (((ch) & ~0xffff) == 0)
-/* Convert Emchar CH to a 16-bit int, as will be stored in the buffer. */
-#define emchar_to_raw_16_bit_fixed(ch, object) ((UINT_16_BIT) (ch))
+#define raw_8_bit_fixed_to_ichar(ch, object) ((Ichar) (ch))
+
+#define ichar_16_bit_fixed_p(ch, object)   (((ch) & ~0xffff) == 0)
+/* Convert Ichar CH to a 16-bit int, as will be stored in the buffer. */
+#define ichar_to_raw_16_bit_fixed(ch, object) ((UINT_16_BIT) (ch))
 /* Convert the other way. */
-#define raw_16_bit_fixed_to_emchar(ch, object) ((Emchar) (ch))
-
-/* Convert Emchar CH to a 32-bit int, as will be stored in the buffer. */
-#define emchar_to_raw_32_bit_fixed(ch, object) ((UINT_32_BIT) (ch))
+#define raw_16_bit_fixed_to_ichar(ch, object) ((Ichar) (ch))
+
+/* Convert Ichar CH to a 32-bit int, as will be stored in the buffer. */
+#define ichar_to_raw_32_bit_fixed(ch, object) ((UINT_32_BIT) (ch))
 /* Convert the other way. */
-#define raw_32_bit_fixed_to_emchar(ch, object) ((Emchar) (ch))
+#define raw_32_bit_fixed_to_ichar(ch, object) ((Ichar) (ch))

 /* Return the "raw value" of a character as stored in the buffer.  In the
    default format, this is just the same as the character.  In fixed-width
@@ -262,23 +262,23 @@
    in the buffer into a character. */

 DECLARE_INLINE_HEADER (
-Raw_Emchar
-emchar_to_raw (Emchar ch, Internal_Format fmt, Lisp_Object object)
+Raw_Ichar
+ichar_to_raw (Ichar ch, Internal_Format fmt, Lisp_Object object)
 )
 {
   switch (fmt)
     {
     case FORMAT_DEFAULT:
-      return (Raw_Emchar) ch;
+      return (Raw_Ichar) ch;
     case FORMAT_16_BIT_FIXED:
-      text_checking_assert (emchar_16_bit_fixed_p (ch, object));
-      return (Raw_Emchar) emchar_to_raw_16_bit_fixed (ch, object);
+      text_checking_assert (ichar_16_bit_fixed_p (ch, object));
+      return (Raw_Ichar) ichar_to_raw_16_bit_fixed (ch, object);
     case FORMAT_32_BIT_FIXED:
-      return (Raw_Emchar) emchar_to_raw_32_bit_fixed (ch, object);
+      return (Raw_Ichar) ichar_to_raw_32_bit_fixed (ch, object);
     default:
       text_checking_assert (fmt == FORMAT_8_BIT_FIXED);
-      text_checking_assert (emchar_8_bit_fixed_p (ch, object));
-      return (Raw_Emchar) emchar_to_raw_8_bit_fixed (ch, object);
+      text_checking_assert (ichar_8_bit_fixed_p (ch, object));
+      return (Raw_Ichar) ichar_to_raw_8_bit_fixed (ch, object);
     }
 }

@@ -287,7 +287,7 @@

 DECLARE_INLINE_HEADER (
 int
-emchar_fits_in_format (Emchar ch, Internal_Format fmt, Lisp_Object object)
+ichar_fits_in_format (Ichar ch, Internal_Format fmt, Lisp_Object object)
 )
 {
   switch (fmt)
@@ -295,12 +295,12 @@
     case FORMAT_DEFAULT:
       return 1;
     case FORMAT_16_BIT_FIXED:
-      return emchar_16_bit_fixed_p (ch, object);
+      return ichar_16_bit_fixed_p (ch, object);
     case FORMAT_32_BIT_FIXED:
       return 1;
     default:
       text_checking_assert (fmt == FORMAT_8_BIT_FIXED);
-      return emchar_8_bit_fixed_p (ch, object);
+      return ichar_8_bit_fixed_p (ch, object);
     }
 }

@@ -320,8 +320,8 @@

 #else

-#define emchar_to_raw(ch, fmt, object) ((Raw_Emchar) (ch))
-#define emchar_fits_in_format(ch, fmt, object) 1
+#define ichar_to_raw(ch, fmt, object) ((Raw_Ichar) (ch))
+#define ichar_fits_in_format(ch, fmt, object) 1
 #define objects_have_same_internal_representation(srcobj, dstobj) 1

 #endif /* MULE */
@@ -355,17 +355,17 @@

   Some terminology:

-  "charptr" appearing in the macros means "internal-format text" -- type
-  `Intbyte *'.  Operations on such pointers themselves, rather than on the
-  text being pointed to, have "charptr" instead of "charptr" in the macro
-  name.  "emchar" in the macro names means an Emchar -- the representation
+  "itext" appearing in the macros means "internal-format text" -- type
+  `Ibyte *'.  Operations on such pointers themselves, rather than on the
+  text being pointed to, have "itext" instead of "itext" in the macro
+  name.  "ichar" in the macro names means an Ichar -- the representation
   of a character as a single integer rather than a series of bytes, as part
-  of "charptr".  Many of the macros below are for converting between the
+  of "itext".  Many of the macros below are for converting between the
   two representations of characters.

-  Note also that we try to consistently distinguish between an "Emchar" and
+  Note also that we try to consistently distinguish between an "Ichar" and
   a Lisp character.  Stuff working with Lisp characters often just says
-  "char", so we consistently use "Emchar" when that's what we're working
+  "char", so we consistently use "Ichar" when that's what we're working
   with. */

 /* The three golden rules of macros:
@@ -416,46 +416,46 @@
 */

 /* ---------------------------------------------------------------------- */
-/*      Working with charptr's (pointers to internally-formatted text)    */
+/*      Working with itext's (pointers to internally-formatted text)    */
 /* ---------------------------------------------------------------------- */

-/* Given an charptr, does it point to the beginning of a character?
+/* Given an itext, does it point to the beginning of a character?
  */

 #ifdef MULE
-# define valid_charptr_p(ptr) intbyte_first_byte_p (* (ptr))
+# define valid_ibyteptr_p(ptr) ibyte_first_byte_p (* (ptr))
 #else
-# define valid_charptr_p(ptr) 1
+# define valid_ibyteptr_p(ptr) 1
 #endif

-/* If error-checking is enabled, assert that the given charptr points to
+/* If error-checking is enabled, assert that the given itext points to
    the beginning of a character.  Otherwise, do nothing.
    */

-#define assert_valid_charptr(ptr) text_checking_assert (valid_charptr_p (ptr))
-
-/* Given a charptr (assumed to point at the beginning of a character),
+#define assert_valid_ibyteptr(ptr) text_checking_assert (valid_ibyteptr_p (ptr))
+
+/* Given a itext (assumed to point at the beginning of a character),
    modify that pointer so it points to the beginning of the next character.

-   Note that INC_CHARPTR() and DEC_CHARPTR() have to be written in
-   completely separate ways.  INC_CHARPTR() cannot use the DEC_CHARPTR()
+   Note that INC_IBYTEPTR() and DEC_IBYTEPTR() have to be written in
+   completely separate ways.  INC_IBYTEPTR() cannot use the DEC_IBYTEPTR()
    trick of looking for a valid first byte because it might run off
-   the end of the string.  DEC_CHARPTR() can't use the INC_CHARPTR()
+   the end of the string.  DEC_IBYTEPTR() can't use the INC_IBYTEPTR()
    method because it doesn't have easy access to the first byte of
    the character it's moving over. */

-#define INC_CHARPTR(ptr) do {			\
-  assert_valid_charptr (ptr);			\
+#define INC_IBYTEPTR(ptr) do {			\
+  assert_valid_ibyteptr (ptr);			\
   (ptr) += rep_bytes_by_first_byte (* (ptr));	\
 } while (0)

-#define INC_CHARPTR_FMT(ptr, fmt)					\
+#define INC_IBYTEPTR_FMT(ptr, fmt)					\
 do {									\
   Internal_Format __icf_fmt = (fmt);					\
   switch (__icf_fmt)							\
     {									\
     case FORMAT_DEFAULT:						\
-      INC_CHARPTR (ptr);						\
+      INC_IBYTEPTR (ptr);						\
       break;								\
     case FORMAT_16_BIT_FIXED:						\
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_16_BIT));	\
@@ -472,35 +472,35 @@
     }									\
 } while (0)

-/* Given a charptr (assumed to point at the beginning of a character or at
+/* Given a itext (assumed to point at the beginning of a character or at
    the very end of the text), modify that pointer so it points to the
    beginning of the previous character.
    */

 #ifdef ERROR_CHECK_TEXT
 /* We use a separate definition to avoid warnings about unused dc_ptr1 */
-#define DEC_CHARPTR(ptr) do {						      \
-  const Intbyte *dc_ptr1 = (ptr);					      \
+#define DEC_IBYTEPTR(ptr) do {						      \
+  const Ibyte *dc_ptr1 = (ptr);					      \
   do {									      \
     (ptr)--;								      \
-  } while (!valid_charptr_p (ptr));					      \
+  } while (!valid_ibyteptr_p (ptr));					      \
   text_checking_assert (dc_ptr1 - (ptr) == rep_bytes_by_first_byte (*(ptr))); \
 } while (0)
 #else
-#define DEC_CHARPTR(ptr) do {						      \
+#define DEC_IBYTEPTR(ptr) do {						      \
   do {									      \
     (ptr)--;								      \
-  } while (!valid_charptr_p (ptr));					      \
+  } while (!valid_ibyteptr_p (ptr));					      \
 } while (0)
 #endif /* ERROR_CHECK_TEXT */

-#define DEC_CHARPTR_FMT(ptr, fmt)					\
+#define DEC_IBYTEPTR_FMT(ptr, fmt)					\
 do {									\
   Internal_Format __icf_fmt = (fmt);					\
   switch (__icf_fmt)							\
     {									\
     case FORMAT_DEFAULT:						\
-      DEC_CHARPTR (ptr);						\
+      DEC_IBYTEPTR (ptr);						\
       break;								\
     case FORMAT_16_BIT_FIXED:						\
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_16_BIT));	\
@@ -530,8 +530,8 @@

 /* Note that this reads the byte at *PTR! */

-#define VALIDATE_CHARPTR_BACKWARD(ptr) do {	\
-  while (!valid_charptr_p (ptr)) ptr--;		\
+#define VALIDATE_IBYTEPTR_BACKWARD(ptr) do {	\
+  while (!valid_ibyteptr_p (ptr)) ptr--;		\
 } while (0)

 /* Make sure that PTR is pointing to the beginning of a character.  If not,
@@ -540,27 +540,27 @@
    if you're passed an "invalid" char * pointer.
    */

-/* This needs to be trickier than VALIDATE_CHARPTR_BACKWARD() to avoid the
+/* This needs to be trickier than VALIDATE_IBYTEPTR_BACKWARD() to avoid the
    possibility of running off the end of the string. */

-#define VALIDATE_CHARPTR_FORWARD(ptr) do {	\
-  Intbyte *vcf_ptr = (ptr);			\
-  VALIDATE_CHARPTR_BACKWARD (vcf_ptr);		\
+#define VALIDATE_IBYTEPTR_FORWARD(ptr) do {	\
+  Ibyte *vcf_ptr = (ptr);			\
+  VALIDATE_IBYTEPTR_BACKWARD (vcf_ptr);		\
   if (vcf_ptr != (ptr))				\
     {						\
       (ptr) = vcf_ptr;				\
-      INC_CHARPTR (ptr);			\
+      INC_IBYTEPTR (ptr);			\
     }						\
 } while (0)

 #else /* not MULE */
-#define VALIDATE_CHARPTR_BACKWARD(ptr)
-#define VALIDATE_CHARPTR_FORWARD(ptr)
+#define VALIDATE_IBYTEPTR_BACKWARD(ptr)
+#define VALIDATE_IBYTEPTR_FORWARD(ptr)
 #endif /* not MULE */

 #ifdef MULE

-/* Given a Intbyte string at PTR of size N, possibly with a partial
+/* Given a Ibyte string at PTR of size N, possibly with a partial
    character at the end, return the size of the longest substring of
    complete characters.  Does not assume that the byte at *(PTR + N) is
    readable.  Note that there are not too many places where it is
@@ -569,15 +569,15 @@

 DECLARE_INLINE_HEADER (
 Bytecount
-validate_intbyte_string_backward (const Intbyte *ptr, Bytecount n)
+validate_ibyte_string_backward (const Ibyte *ptr, Bytecount n)
 )
 {
-  const Intbyte *ptr2;
+  const Ibyte *ptr2;

   if (n == 0)
     return n;
   ptr2 = ptr + n - 1;
-  VALIDATE_CHARPTR_BACKWARD (ptr2);
+  VALIDATE_IBYTEPTR_BACKWARD (ptr2);
   if (ptr2 + rep_bytes_by_first_byte (*ptr2) != ptr + n)
     return ptr2 - ptr;
   return n;
@@ -585,7 +585,7 @@

 #else

-#define validate_intbyte_string_backward(ptr, n) (n)
+#define validate_ibyte_string_backward(ptr, n) (n)

 #endif /* MULE */

@@ -596,15 +596,15 @@

 #ifdef MULE

-Charcount bytecount_to_charcount_fun (const Intbyte *ptr, Bytecount len);
-Bytecount charcount_to_bytecount_fun (const Intbyte *ptr, Charcount len);
+Charcount bytecount_to_charcount_fun (const Ibyte *ptr, Bytecount len);
+Bytecount charcount_to_bytecount_fun (const Ibyte *ptr, Charcount len);

 /* Given a pointer to a text string and a length in bytes, return
    the equivalent length in characters. */

 DECLARE_INLINE_HEADER (
 Charcount
-bytecount_to_charcount (const Intbyte *ptr, Bytecount len)
+bytecount_to_charcount (const Ibyte *ptr, Bytecount len)
 )
 {
   if (len < 20) /* Just a random guess, but it should be more or less correct.
@@ -612,10 +612,10 @@
 		   which should be more efficient. */
     {
       Charcount count = 0;
-      const Intbyte *end = ptr + len;
+      const Ibyte *end = ptr + len;
       while (ptr < end)
 	{
-	  INC_CHARPTR (ptr);
+	  INC_IBYTEPTR (ptr);
 	  count++;
 	}
       /* Bomb out if the specified substring ends in the middle
@@ -638,16 +638,16 @@

 DECLARE_INLINE_HEADER (
 Bytecount
-charcount_to_bytecount (const Intbyte *ptr, Charcount len)
+charcount_to_bytecount (const Ibyte *ptr, Charcount len)
 )
 {
   text_checking_assert (len >= 0);
   if (len < 20) /* See above */
     {
-      const Intbyte *newptr = ptr;
+      const Ibyte *newptr = ptr;
       while (len > 0)
 	{
-	  INC_CHARPTR (newptr);
+	  INC_IBYTEPTR (newptr);
 	  len--;
 	}
       return newptr - ptr;
@@ -662,7 +662,7 @@

 DECLARE_INLINE_HEADER (
 Charcount
-bytecount_to_charcount_fmt (const Intbyte *ptr, Bytecount len,
+bytecount_to_charcount_fmt (const Ibyte *ptr, Bytecount len,
 			    Internal_Format fmt)
 )
 {
@@ -688,7 +688,7 @@

 DECLARE_INLINE_HEADER (
 Bytecount
-charcount_to_bytecount_fmt (const Intbyte *ptr, Charcount len,
+charcount_to_bytecount_fmt (const Ibyte *ptr, Charcount len,
 			    Internal_Format fmt)
 )
 {
@@ -728,7 +728,7 @@
    often, we'll be helpful and define a special macro for it.]
 */

-#define charptr_emchar_len(ptr) rep_bytes_by_first_byte (*(ptr))
+#define itext_ichar_len(ptr) rep_bytes_by_first_byte (*(ptr))

 /* Return the length of the first character at PTR, which is in the
    specified internal format.  Equivalent to charcount_to_bytecount_fmt
@@ -737,13 +737,13 @@

 DECLARE_INLINE_HEADER (
 Bytecount
-charptr_emchar_len_fmt (const Intbyte *ptr, Internal_Format fmt)
+itext_ichar_len_fmt (const Ibyte *ptr, Internal_Format fmt)
 )
 {
   switch (fmt)
     {
     case FORMAT_DEFAULT:
-      return charptr_emchar_len (ptr);
+      return itext_ichar_len (ptr);
     case FORMAT_16_BIT_FIXED:
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_16_BIT));
       return 2;
@@ -761,80 +761,80 @@
 */

 DECLARE_INLINE_HEADER (
-const Intbyte *
-charptr_n_addr (const Intbyte *ptr, Charcount offset)
+const Ibyte *
+itext_n_addr (const Ibyte *ptr, Charcount offset)
 )
 {
   return ptr + charcount_to_bytecount (ptr, offset);
 }

-/* Given a charptr and an offset into the text pointed to by the charptr,
+/* Given a itext and an offset into the text pointed to by the itext,
    modify the offset so it points to the beginning of the next character.
 */

 #define INC_BYTECOUNT(ptr, pos) do {			\
-  assert_valid_charptr (ptr);				\
+  assert_valid_ibyteptr (ptr);				\
   (pos += rep_bytes_by_first_byte (* ((ptr) + (pos))));	\
 } while (0)

 /* -------------------------------------------------------------------- */
-/*      Retrieving or changing the character pointed to by a charptr    */
+/*      Retrieving or changing the character pointed to by a itext    */
 /* -------------------------------------------------------------------- */

-#define simple_charptr_emchar(ptr)		((Emchar) (ptr)[0])
-#define simple_set_charptr_emchar(ptr, x) \
-	((ptr)[0] = (Intbyte) (x), (Bytecount) 1)
-#define simple_charptr_copy_emchar(src, dst) \
+#define simple_itext_ichar(ptr)		((Ichar) (ptr)[0])
+#define simple_set_itext_ichar(ptr, x) \
+	((ptr)[0] = (Ibyte) (x), (Bytecount) 1)
+#define simple_itext_copy_ichar(src, dst) \
 	((dst)[0] = *(src), (Bytecount) 1)

 #ifdef MULE

-Emchar non_ascii_charptr_emchar (const Intbyte *ptr);
-Bytecount non_ascii_set_charptr_emchar (Intbyte *ptr, Emchar c);
-Bytecount non_ascii_charptr_copy_emchar (const Intbyte *src, Intbyte *dst);
-
-/* Retrieve the character pointed to by PTR as an Emchar. */
+Ichar non_ascii_itext_ichar (const Ibyte *ptr);
+Bytecount non_ascii_set_itext_ichar (Ibyte *ptr, Ichar c);
+Bytecount non_ascii_itext_copy_ichar (const Ibyte *src, Ibyte *dst);
+
+/* Retrieve the character pointed to by PTR as an Ichar. */

 DECLARE_INLINE_HEADER (
-Emchar
-charptr_emchar (const Intbyte *ptr)
+Ichar
+itext_ichar (const Ibyte *ptr)
 )
 {
   return byte_ascii_p (*ptr) ?
-    simple_charptr_emchar (ptr) :
-    non_ascii_charptr_emchar (ptr);
+    simple_itext_ichar (ptr) :
+    non_ascii_itext_ichar (ptr);
 }

 /* Retrieve the character pointed to by PTR (a pointer to text in the
    format FMT, coming from OBJECT [a buffer, string?, or nil]) as an
-   Emchar.
+   Ichar.

    Note: For these and other *_fmt() functions, if you pass in a constant
    FMT, the switch will be optimized out of existence.  Therefore, there is
    no need to create separate versions for the various formats for
-   "efficiency reasons".  In fact, we don't really need charptr_emchar()
+   "efficiency reasons".  In fact, we don't really need itext_ichar()
    and such written separately, but they are used often so it's simpler
    that way. */

 DECLARE_INLINE_HEADER (
-Emchar
-charptr_emchar_fmt (const Intbyte *ptr, Internal_Format fmt,
+Ichar
+itext_ichar_fmt (const Ibyte *ptr, Internal_Format fmt,
 		    Lisp_Object object)
 )
 {
   switch (fmt)
     {
     case FORMAT_DEFAULT:
-      return charptr_emchar (ptr);
+      return itext_ichar (ptr);
     case FORMAT_16_BIT_FIXED:
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_16_BIT));
-      return raw_16_bit_fixed_to_emchar (* (UINT_16_BIT *) ptr, object);
+      return raw_16_bit_fixed_to_ichar (* (UINT_16_BIT *) ptr, object);
     case FORMAT_32_BIT_FIXED:
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_32_BIT));
-      return raw_32_bit_fixed_to_emchar (* (UINT_32_BIT *) ptr, object);
+      return raw_32_bit_fixed_to_ichar (* (UINT_32_BIT *) ptr, object);
     default:
       text_checking_assert (fmt == FORMAT_8_BIT_FIXED);
-      return raw_8_bit_fixed_to_emchar (*ptr, object);
+      return raw_8_bit_fixed_to_ichar (*ptr, object);
     }
 }

@@ -843,98 +843,98 @@
    character at PTR is ASCII (range 0 - 127), that character will be
    returned; otherwise, some character outside of the ASCII range will be
    returned, but not necessarily the character actually at PTR.  This will
-   be faster than charptr_emchar_fmt() for some formats -- in particular,
+   be faster than itext_ichar_fmt() for some formats -- in particular,
    FORMAT_DEFAULT. */

 DECLARE_INLINE_HEADER (
-Emchar
-charptr_emchar_ascii_fmt (const Intbyte *ptr, Internal_Format fmt,
+Ichar
+itext_ichar_ascii_fmt (const Ibyte *ptr, Internal_Format fmt,
 			  Lisp_Object object)
 )
 {
   switch (fmt)
     {
     case FORMAT_DEFAULT:
-      return (Emchar) *ptr;
+      return (Ichar) *ptr;
     case FORMAT_16_BIT_FIXED:
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_16_BIT));
-      return raw_16_bit_fixed_to_emchar (* (UINT_16_BIT *) ptr, object);
+      return raw_16_bit_fixed_to_ichar (* (UINT_16_BIT *) ptr, object);
     case FORMAT_32_BIT_FIXED:
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_32_BIT));
-      return raw_32_bit_fixed_to_emchar (* (UINT_32_BIT *) ptr, object);
+      return raw_32_bit_fixed_to_ichar (* (UINT_32_BIT *) ptr, object);
     default:
       text_checking_assert (fmt == FORMAT_8_BIT_FIXED);
-      return raw_8_bit_fixed_to_emchar (*ptr, object);
+      return raw_8_bit_fixed_to_ichar (*ptr, object);
     }
 }

 /* Return the "raw value" of the character at PTR, in format FMT.  This is
    useful when searching for a character; convert the character using
-   emchar_to_raw(). */
+   ichar_to_raw(). */

 DECLARE_INLINE_HEADER (
-Raw_Emchar
-charptr_emchar_raw_fmt (const Intbyte *ptr, Internal_Format fmt)
+Raw_Ichar
+itext_ichar_raw_fmt (const Ibyte *ptr, Internal_Format fmt)
 )
 {
   switch (fmt)
     {
     case FORMAT_DEFAULT:
-      return (Raw_Emchar) charptr_emchar (ptr);
+      return (Raw_Ichar) itext_ichar (ptr);
     case FORMAT_16_BIT_FIXED:
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_16_BIT));
-      return (Raw_Emchar) (* (UINT_16_BIT *) ptr);
+      return (Raw_Ichar) (* (UINT_16_BIT *) ptr);
     case FORMAT_32_BIT_FIXED:
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_32_BIT));
-      return (Raw_Emchar) (* (UINT_32_BIT *) ptr);
+      return (Raw_Ichar) (* (UINT_32_BIT *) ptr);
     default:
       text_checking_assert (fmt == FORMAT_8_BIT_FIXED);
-      return (Raw_Emchar) (*ptr);
+      return (Raw_Ichar) (*ptr);
     }
 }

-/* Store the character CH (an Emchar) as internally-formatted text starting
+/* Store the character CH (an Ichar) as internally-formatted text starting
    at PTR.  Return the number of bytes stored.
 */

 DECLARE_INLINE_HEADER (
 Bytecount
-set_charptr_emchar (Intbyte *ptr, Emchar x)
+set_itext_ichar (Ibyte *ptr, Ichar x)
 )
 {
-  return !emchar_multibyte_p (x) ?
-    simple_set_charptr_emchar (ptr, x) :
-    non_ascii_set_charptr_emchar (ptr, x);
+  return !ichar_multibyte_p (x) ?
+    simple_set_itext_ichar (ptr, x) :
+    non_ascii_set_itext_ichar (ptr, x);
 }

-/* Store the character CH (an Emchar) as internally-formatted text of
+/* Store the character CH (an Ichar) as internally-formatted text of
    format FMT starting at PTR, which comes from OBJECT.  Return the number
    of bytes stored.
 */

 DECLARE_INLINE_HEADER (
 Bytecount
-set_charptr_emchar_fmt (Intbyte *ptr, Emchar x, Internal_Format fmt,
+set_itext_ichar_fmt (Ibyte *ptr, Ichar x, Internal_Format fmt,
 			Lisp_Object object)
 )
 {
   switch (fmt)
     {
     case FORMAT_DEFAULT:
-      return set_charptr_emchar (ptr, x);
+      return set_itext_ichar (ptr, x);
     case FORMAT_16_BIT_FIXED:
-      text_checking_assert (emchar_16_bit_fixed_p (x, object));
+      text_checking_assert (ichar_16_bit_fixed_p (x, object));
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_16_BIT));
-      * (UINT_16_BIT *) ptr = emchar_to_raw_16_bit_fixed (x, object);
+      * (UINT_16_BIT *) ptr = ichar_to_raw_16_bit_fixed (x, object);
       return 2;
     case FORMAT_32_BIT_FIXED:
       text_checking_assert (ptr == ALIGN_PTR (ptr, UINT_32_BIT));
-      * (UINT_32_BIT *) ptr = emchar_to_raw_32_bit_fixed (x, object);
+      * (UINT_32_BIT *) ptr = ichar_to_raw_32_bit_fixed (x, object);
       return 4;
     default:
       text_checking_assert (fmt == FORMAT_8_BIT_FIXED);
-      text_checking_assert (emchar_8_bit_fixed_p (x, object));
-      *ptr = emchar_to_raw_8_bit_fixed (x, object);
+      text_checking_assert (ichar_8_bit_fixed_p (x, object));
+      *ptr = ichar_to_raw_8_bit_fixed (x, object);
       return 1;
     }
 }
@@ -945,79 +945,79 @@

 DECLARE_INLINE_HEADER (
 Bytecount
-charptr_copy_emchar (const Intbyte *src, Intbyte *dst)
+itext_copy_ichar (const Ibyte *src, Ibyte *dst)
 )
 {
   return byte_ascii_p (*src) ?
-    simple_charptr_copy_emchar (src, dst) :
-    non_ascii_charptr_copy_emchar (src, dst);
+    simple_itext_copy_ichar (src, dst) :
+    non_ascii_itext_copy_ichar (src, dst);
 }

 #else /* not MULE */

-# define charptr_emchar(ptr) simple_charptr_emchar (ptr)
-# define charptr_emchar_fmt(ptr, fmt, object) charptr_emchar (ptr)
-# define charptr_emchar_ascii_fmt(ptr, fmt, object) charptr_emchar (ptr)
-# define charptr_emchar_raw_fmt(ptr, fmt) charptr_emchar (ptr)
-# define set_charptr_emchar(ptr, x) simple_set_charptr_emchar (ptr, x)
-# define set_charptr_emchar_fmt(ptr, x, fmt, obj) set_charptr_emchar (ptr, x)
-# define charptr_copy_emchar(src, dst) simple_charptr_copy_emchar (src, dst)
+# define itext_ichar(ptr) simple_itext_ichar (ptr)
+# define itext_ichar_fmt(ptr, fmt, object) itext_ichar (ptr)
+# define itext_ichar_ascii_fmt(ptr, fmt, object) itext_ichar (ptr)
+# define itext_ichar_raw_fmt(ptr, fmt) itext_ichar (ptr)
+# define set_itext_ichar(ptr, x) simple_set_itext_ichar (ptr, x)
+# define set_itext_ichar_fmt(ptr, x, fmt, obj) set_itext_ichar (ptr, x)
+# define itext_copy_ichar(src, dst) simple_itext_copy_ichar (src, dst)

 #endif /* not MULE */

 /* Retrieve the character at offset N (in characters) from PTR, as an
-   Emchar.
+   Ichar.
 */

-#define charptr_emchar_n(ptr, offset) \
-  charptr_emchar (charptr_n_addr (ptr, offset))
+#define itext_ichar_n(ptr, offset) \
+  itext_ichar (itext_n_addr (ptr, offset))


 /* ---------------------------- */
-/*     Working with Emchars     */
+/*     Working with Ichars     */
 /* ---------------------------- */

-/* NOTE: There are other functions/macros for working with Emchars in
-   charset.h, for retrieving the charset of an Emchar, the length of an
-   Emchar when converted to text, etc.
+/* NOTE: There are other functions/macros for working with Ichars in
+   charset.h, for retrieving the charset of an Ichar, the length of an
+   Ichar when converted to text, etc.
 */

 #ifdef MULE

-int non_ascii_valid_emchar_p (Emchar ch);
-
-/* Return whether the given Emchar is valid.
+int non_ascii_valid_ichar_p (Ichar ch);
+
+/* Return whether the given Ichar is valid.
  */

 DECLARE_INLINE_HEADER (
 int
-valid_emchar_p (Emchar ch)
+valid_ichar_p (Ichar ch)
 )
 {
-  return (! (ch & ~0xFF)) || non_ascii_valid_emchar_p (ch);
+  return (! (ch & ~0xFF)) || non_ascii_valid_ichar_p (ch);
 }

 #else /* not MULE */

-#define valid_emchar_p(ch) (! (ch & ~0xFF))
+#define valid_ichar_p(ch) (! (ch & ~0xFF))

 #endif /* not MULE */

 DECLARE_INLINE_HEADER (
 Lisp_Object
-make_char (Emchar val)
+make_char (Ichar val)
 )
 {
-  type_checking_assert (valid_emchar_p (val));
+  type_checking_assert (valid_ichar_p (val));
   return make_char_1 (val);
 }

-#define CHAR_INTP(x) (INTP (x) && valid_emchar_p (XINT (x)))
+#define CHAR_INTP(x) (INTP (x) && valid_ichar_p (XINT (x)))

 #define CHAR_OR_CHAR_INTP(x) (CHARP (x) || CHAR_INTP (x))

 DECLARE_INLINE_HEADER (
-Emchar
+Ichar
 XCHAR_OR_CHAR_INT (Lisp_Object obj)
 )
 {
@@ -1058,15 +1058,15 @@

 #define ASSERT_VALID_BYTE_STRING_INDEX_UNSAFE(s, x) do {		\
   text_checking_assert ((x) >= 0 && x <= XSTRING_LENGTH (s));		\
-  text_checking_assert (valid_charptr_p (string_byte_addr (s, x)));	\
+  text_checking_assert (valid_ibyteptr_p (string_byte_addr (s, x)));	\
 } while (0)

 /* Convert offset I in string S to a pointer to text there. */
 #define string_byte_addr(s, i) (&(XSTRING_DATA (s)[i]))
 /* Convert pointer to text in string S into the byte offset to that text. */
 #define string_addr_to_byte(s, ptr) ((Bytecount) ((ptr) - XSTRING_DATA (s)))
-/* Return the Emchar at *CHARACTER* offset I. */
-#define string_emchar(s, i) charptr_emchar (string_char_addr (s, i))
+/* Return the Ichar at *CHARACTER* offset I. */
+#define string_ichar(s, i) itext_ichar (string_char_addr (s, i))

 #ifdef ERROR_CHECK_TEXT
 #define SLEDGEHAMMER_CHECK_ASCII_BEGIN
@@ -1081,24 +1081,24 @@
 /* Make an alloca'd copy of a Lisp string */
 #define LISP_STRING_TO_ALLOCA(s, lval)					\
 do {									\
-  Intbyte **_lta_ = (Intbyte **) &(lval);				\
+  Ibyte **_lta_ = (Ibyte **) &(lval);				\
   Lisp_Object _lta_2 = (s);						\
-  *_lta_ = alloca_array (Intbyte, 1 + XSTRING_LENGTH (_lta_2));		\
+  *_lta_ = alloca_array (Ibyte, 1 + XSTRING_LENGTH (_lta_2));		\
   memcpy (*_lta_, XSTRING_DATA (_lta_2), 1 + XSTRING_LENGTH (_lta_2));	\
 } while (0)

-/* Make an alloca'd copy of a Intbyte * */
-#define INTBYTE_STRING_TO_ALLOCA(p, lval)		\
+/* Make an alloca'd copy of a Ibyte * */
+#define IBYTE_STRING_TO_ALLOCA(p, lval)		\
 do {							\
-  Intbyte **_bsta_ = (Intbyte **) &(lval);		\
-  const Intbyte *_bsta_2 = (p);				\
+  Ibyte **_bsta_ = (Ibyte **) &(lval);		\
+  const Ibyte *_bsta_2 = (p);				\
   Bytecount _bsta_3 = qxestrlen (_bsta_2);		\
-  *_bsta_ = alloca_array (Intbyte, 1 + _bsta_3);	\
+  *_bsta_ = alloca_array (Ibyte, 1 + _bsta_3);	\
   memcpy (*_bsta_, _bsta_2, 1 + _bsta_3);		\
 } while (0)


-#define alloca_intbytes(num) alloca_array (Intbyte, num)
+#define alloca_ibytes(num) alloca_array (Ibyte, num)
 #define alloca_extbytes(num) alloca_array (Extbyte, num)

 void resize_string (Lisp_Object s, Bytecount pos, Bytecount delta);
@@ -1218,7 +1218,7 @@
 }

 DECLARE_INLINE_HEADER (
-const Intbyte *
+const Ibyte *
 string_char_addr (Lisp_Object s, Charcount idx)
 )
 {
@@ -1228,7 +1228,7 @@
 /* WARNING: If you modify an existing string, you must call
    bump_string_modiff() afterwards. */
 #ifdef MULE
-void set_string_char (Lisp_Object s, Charcount i, Emchar c);
+void set_string_char (Lisp_Object s, Charcount i, Ichar c);
 #else
 #define set_string_char(s, i, c) set_string_byte (s, i, c)
 #endif /* not MULE */
@@ -1239,8 +1239,8 @@
 prev_string_index (Lisp_Object s, Bytecount idx)
 )
 {
-  const Intbyte *ptr = string_byte_addr (s, idx);
-  DEC_CHARPTR (ptr);
+  const Ibyte *ptr = string_byte_addr (s, idx);
+  DEC_IBYTEPTR (ptr);
   return string_addr_to_byte (s, ptr);
 }

@@ -1250,8 +1250,8 @@
 next_string_index (Lisp_Object s, Bytecount idx)
 )
 {
-  const Intbyte *ptr = string_byte_addr (s, idx);
-  INC_CHARPTR (ptr);
+  const Ibyte *ptr = string_byte_addr (s, idx);
+  INC_IBYTEPTR (ptr);
   return string_addr_to_byte (s, ptr);
 }

@@ -1281,8 +1281,8 @@
        it can be passed to standard routines
    (e) it provides a much more powerful set of operations and knows about
        all the standard places where string data might reside: Lisp_Objects,
-       other Eistrings, Intbyte * data with or without an explicit length,
-       ASCII strings, Emchars, etc.
+       other Eistrings, Ibyte * data with or without an explicit length,
+       ASCII strings, Ichars, etc.
    (f) it provides easy operations to convert to/from externally-formatted
        data, and is easier to use than the standard TO_INTERNAL_FORMAT
        and TO_EXTERNAL_FORMAT macros. (An Eistring can store both the internal
@@ -1368,8 +1368,8 @@
         ... from another Eistring.
    void eicpy_lstr (Eistring *eistr, Lisp_Object lisp_string);
         ... from a Lisp_Object string.
-   void eicpy_ch (Eistring *eistr, Emchar ch);
-        ... from an Emchar (this can be a conventional C character).
+   void eicpy_ch (Eistring *eistr, Ichar ch);
+        ... from an Ichar (this can be a conventional C character).

    void eicpy_lstr_off (Eistring *eistr, Lisp_Object lisp_string,
                         Bytecount off, Charcount charoff,
@@ -1379,16 +1379,16 @@
 		    Bytecount off, Charcount charoff,
 		    Bytecount len, Charcount charlen);
         ... from a section of a Lisp_Object buffer.
-   void eicpy_raw (Eistring *eistr, const Intbyte *data, Bytecount len);
+   void eicpy_raw (Eistring *eistr, const Ibyte *data, Bytecount len);
         ... from raw internal-format data in the default internal format.
-   void eicpy_rawz (Eistring *eistr, const Intbyte *data);
+   void eicpy_rawz (Eistring *eistr, const Ibyte *data);
         ... from raw internal-format data in the default internal format
         that is "null-terminated" (the meaning of this depends on the nature
         of the default internal format).
-   void eicpy_raw_fmt (Eistring *eistr, const Intbyte *data, Bytecount len,
+   void eicpy_raw_fmt (Eistring *eistr, const Ibyte *data, Bytecount len,
                        Internal_Format intfmt, Lisp_Object object);
         ... from raw internal-format data in the specified format.
-   void eicpy_rawz_fmt (Eistring *eistr, const Intbyte *data,
+   void eicpy_rawz_fmt (Eistring *eistr, const Ibyte *data,
                         Internal_Format intfmt, Lisp_Object object);
         ... from raw internal-format data in the specified format that is
         "null-terminated" (the meaning of this depends on the nature of
@@ -1414,7 +1414,7 @@
     *    Getting the data out of the Eistring    *
     **********************************************

-   Intbyte *eidata (Eistring *eistr);
+   Ibyte *eidata (Eistring *eistr);
         Return a pointer to the raw data in an Eistring.  This is NOT
         a copy.

@@ -1426,7 +1426,7 @@
 				  Bytecount len, Charcount charlen);
         Make a Lisp string out of a section of the Eistring.

-   void eicpyout_alloca (Eistring *eistr, LVALUE: Intbyte *ptr_out,
+   void eicpyout_alloca (Eistring *eistr, LVALUE: Ibyte *ptr_out,
                          LVALUE: Bytecount len_out);
         Make an ALLOCA() copy of the data in the Eistring, using the
         default internal format.  Due to the nature of ALLOCA(), this
@@ -1437,21 +1437,21 @@
 	is stored in PTR_OUT, and the length of the data (not including
 	the terminating zero) is stored in LEN_OUT.

-   void eicpyout_alloca_fmt (Eistring *eistr, LVALUE: Intbyte *ptr_out,
+   void eicpyout_alloca_fmt (Eistring *eistr, LVALUE: Ibyte *ptr_out,
                              LVALUE: Bytecount len_out,
                              Internal_Format intfmt, Lisp_Object object);
         Like eicpyout_alloca(), but converts to the specified internal
         format. (No formats other than FORMAT_DEFAULT are currently
         implemented, and you get an assertion failure if you try.)

-   Intbyte *eicpyout_malloc (Eistring *eistr, Bytecount *intlen_out);
+   Ibyte *eicpyout_malloc (Eistring *eistr, Bytecount *intlen_out);
         Make a malloc() copy of the data in the Eistring, using the
         default internal format.  This is a real function.  No lvalues
         passed in.  Returns the new data, and stores the length (not
         including the terminating zero) using INTLEN_OUT, unless it's
         a NULL pointer.

-   Intbyte *eicpyout_malloc_fmt (Eistring *eistr, Internal_Format intfmt,
+   Ibyte *eicpyout_malloc_fmt (Eistring *eistr, Internal_Format intfmt,
                                  Bytecount *intlen_out, Lisp_Object object);
         Like eicpyout_malloc(), but converts to the specified internal
         format. (No formats other than FORMAT_DEFAULT are currently
@@ -1510,9 +1510,9 @@
     *    Getting the character at a position     *
     **********************************************

-   Emchar eigetch (Eistring *eistr, Bytecount bytepos);
+   Ichar eigetch (Eistring *eistr, Bytecount bytepos);
         Return the character at a particular byte offset.
-   Emchar eigetch_char (Eistring *eistr, Charcount charpos);
+   Ichar eigetch_char (Eistring *eistr, Charcount charpos);
         Return the character at a particular character offset.


@@ -1520,9 +1520,9 @@
     *    Setting the character at a position     *
     **********************************************

-   Emchar eisetch (Eistring *eistr, Bytecount bytepos, Emchar chr);
+   Ichar eisetch (Eistring *eistr, Bytecount bytepos, Ichar chr);
         Set the character at a particular byte offset.
-   Emchar eisetch_char (Eistring *eistr, Charcount charpos, Emchar chr);
+   Ichar eisetch_char (Eistring *eistr, Charcount charpos, Ichar chr);
         Set the character at a particular character offset.


@@ -1539,16 +1539,16 @@
    void eicat_c (Eistring *eistr, Char_ASCII *c_string);
         ... from an ASCII null-terminated string.  Non-ASCII characters in
 	the string are *ILLEGAL* (read abort() with error-checking defined).
-   void eicat_raw (ei, const Intbyte *data, Bytecount len);
+   void eicat_raw (ei, const Ibyte *data, Bytecount len);
         ... from raw internal-format data in the default internal format.
-   void eicat_rawz (ei, const Intbyte *data);
+   void eicat_rawz (ei, const Ibyte *data);
         ... from raw internal-format data in the default internal format
         that is "null-terminated" (the meaning of this depends on the nature
         of the default internal format).
    void eicat_lstr (ei, Lisp_Object lisp_string);
         ... from a Lisp_Object string.
-   void eicat_ch (ei, Emchar ch);
-        ... from an Emchar.
+   void eicat_ch (ei, Ichar ch);
+        ... from an Ichar.

   (All except the first variety are convenience functions.
   In the general case, create another Eistring from the source.)
@@ -1570,8 +1570,8 @@
         ... with an ASCII null-terminated string.  Non-ASCII characters in
 	the string are *ILLEGAL* (read abort() with error-checking defined).
    void eisub_ch (Eistring *eistr, Bytecount off, Charcount charoff,
-		  Bytecount len, Charcount charlen, Emchar ch);
-        ... with an Emchar.
+		  Bytecount len, Charcount charlen, Ichar ch);
+        ... with an Ichar.

    void eidel (Eistring *eistr, Bytecount off, Charcount charoff,
 	       Bytecount len, Charcount charlen);
@@ -1602,17 +1602,17 @@
     * Searching in the Eistring for a character  *
     **********************************************

-   Bytecount eichr (Eistring *eistr, Emchar chr);
-   Charcount eichr_char (Eistring *eistr, Emchar chr);
-   Bytecount eichr_off (Eistring *eistr, Emchar chr, Bytecount off,
+   Bytecount eichr (Eistring *eistr, Ichar chr);
+   Charcount eichr_char (Eistring *eistr, Ichar chr);
+   Bytecount eichr_off (Eistring *eistr, Ichar chr, Bytecount off,
 			Charcount charoff);
-   Charcount eichr_off_char (Eistring *eistr, Emchar chr, Bytecount off,
+   Charcount eichr_off_char (Eistring *eistr, Ichar chr, Bytecount off,
 			     Charcount charoff);
-   Bytecount eirchr (Eistring *eistr, Emchar chr);
-   Charcount eirchr_char (Eistring *eistr, Emchar chr);
-   Bytecount eirchr_off (Eistring *eistr, Emchar chr, Bytecount off,
+   Bytecount eirchr (Eistring *eistr, Ichar chr);
+   Charcount eirchr_char (Eistring *eistr, Ichar chr);
+   Bytecount eirchr_off (Eistring *eistr, Ichar chr, Bytecount off,
 			 Charcount charoff);
-   Charcount eirchr_off_char (Eistring *eistr, Emchar chr, Bytecount off,
+   Charcount eirchr_off_char (Eistring *eistr, Ichar chr, Bytecount off,
 			      Charcount charoff);


@@ -1739,11 +1739,11 @@
        practice it's a hassle, so we suggest that you provide
        convenience functions.  In particular, there are two paths you
        can take.  One is minimalist -- it only allows other Eistrings
-       and ASCII data, and Emchars if the particular operation makes
+       and ASCII data, and Ichars if the particular operation makes
        sense with a character.  The other provides interfaces for the
        most commonly-used forms -- Eistring, ASCII data, Lisp string,
        raw internal-format string with length, raw internal-format
-       string without, and possibly Emchar. (In the function names,
+       string without, and possibly Ichar. (In the function names,
        these are designated `ei', `c', `lstr', `raw', `rawz', and
        `ch', respectively.)

@@ -1784,7 +1784,7 @@
 {
   /* Data for the Eistring, stored in the default internal format.
      Always includes terminating null. */
-  Intbyte *data_;
+  Ibyte *data_;
   /* Total number of bytes allocated in DATA (including null). */
   Bytecount max_size_allocated_;
   Bytecount bytelen_;
@@ -1870,13 +1870,13 @@
 	{								      \
 	  if ((ei)->mallocp_)						      \
 	    /* xrealloc always preserves existing data as much as possible */ \
-	    (ei)->data_ = (Intbyte *) xrealloc ((ei)->data_, ei1newsize);     \
+	    (ei)->data_ = (Ibyte *) xrealloc ((ei)->data_, ei1newsize);     \
 	  else								      \
 	    {								      \
 	      /* We don't have realloc, so ALLOCA() more space and copy the   \
 		 data into it. */					      \
-	      Intbyte *ei1oldeidata = (ei)->data_;			      \
-	      (ei)->data_ = (Intbyte *) ALLOCA (ei1newsize);		      \
+	      Ibyte *ei1oldeidata = (ei)->data_;			      \
+	      (ei)->data_ = (Ibyte *) ALLOCA (ei1newsize);		      \
               if (ei1oldeidata)						      \
 	        memcpy ((ei)->data_, ei1oldeidata, ei1oldeibytelen + 1);      \
 	    }								      \
@@ -1936,7 +1936,7 @@
   int ei23charoff = (charoff);						\
   int ei23len = (len);							\
   int ei23charlen = (charlen);						\
-  const Intbyte *ei23data = XSTRING_DATA (ei23lstr);			\
+  const Ibyte *ei23data = XSTRING_DATA (ei23lstr);			\
 									\
   int ei23oldbytelen = (ei)->bytelen_;					\
 									\
@@ -1948,7 +1948,7 @@

 #define eicpy_raw_fmt(ei, ptr, len, fmt, object)			\
 do {									\
-  const Intbyte *ei12ptr = (ptr);					\
+  const Ibyte *ei12ptr = (ptr);					\
   Internal_Format ei12fmt = (fmt);					\
   int ei12len = (len);							\
   assert (ei12fmt == FORMAT_DEFAULT);					\
@@ -1961,7 +1961,7 @@

 #define eicpy_rawz_fmt(ei, ptr, fmt, object)				\
 do {									\
-  const Intbyte *ei12p1ptr = (ptr);					\
+  const Ibyte *ei12p1ptr = (ptr);					\
   Internal_Format ei12p1fmt = (fmt);					\
   assert (ei12p1fmt == FORMAT_DEFAULT);					\
   eicpy_raw_fmt (ei, ei12p1ptr, qxestrlen (ei12p1ptr), fmt, object);	\
@@ -1971,8 +1971,8 @@

 #define eicpy_ch(ei, ch)					\
 do {								\
-  Intbyte ei12p2[MAX_EMCHAR_LEN];				\
-  Bytecount ei12p2len = set_charptr_emchar (ei12p2, ch);	\
+  Ibyte ei12p2[MAX_ICHAR_LEN];				\
+  Bytecount ei12p2len = set_itext_ichar (ei12p2, ch);	\
   EI_ALLOC_AND_COPY (ei, ei12p2, ei12p2len, 1);			\
 } while (0)

@@ -2019,7 +2019,7 @@
 #define eicpy_lstream(eistr, lstream) \
   NOT YET IMPLEMENTED

-#define eireset(eistr) eicpy_rawz (eistr, (Intbyte *) "")
+#define eireset(eistr) eicpy_rawz (eistr, (Ibyte *) "")

 /*   ----- Getting the data out of the Eistring -----   */

@@ -2045,18 +2045,18 @@
   eicpyout_alloca_fmt (eistr, ptrout, lenout, FORMAT_DEFAULT, Qnil)
 #define eicpyout_malloc(eistr, lenout) \
   eicpyout_malloc_fmt (eistr, lenout, FORMAT_DEFAULT, Qnil)
-Intbyte *eicpyout_malloc_fmt (Eistring *eistr, Bytecount *len_out,
+Ibyte *eicpyout_malloc_fmt (Eistring *eistr, Bytecount *len_out,
 			      Internal_Format fmt, Lisp_Object object);
 #define eicpyout_alloca_fmt(eistr, ptrout, lenout, fmt, object)	\
 do {								\
   Internal_Format ei23fmt = (fmt);				\
-  Intbyte *ei23ptrout = &(ptrout);				\
+  Ibyte *ei23ptrout = &(ptrout);				\
   Bytecount *ei23lenout = &(lenout);				\
 								\
   assert (ei23fmt == FORMAT_DEFAULT);				\
 								\
   *ei23lenout = (eistr)->bytelen_;				\
-  *ei23ptrout = alloca_array (Intbyte, (eistr)->bytelen_ + 1);	\
+  *ei23ptrout = alloca_array (Ibyte, (eistr)->bytelen_ + 1);	\
   memcpy (*ei23ptrout, (eistr)->data_, (eistr)->bytelen_ + 1);	\
 } while (0)

@@ -2088,11 +2088,11 @@
   (ei)->mallocp_ = 0;							\
   if ((ei)->data_)							\
     {									\
-      Intbyte *ei13newdata;						\
+      Ibyte *ei13newdata;						\
 									\
       (ei)->max_size_allocated_ =					\
 	eifind_large_enough_buffer (0, (ei)->bytelen_ + 1);		\
-      ei13newdata = (Intbyte *) ALLOCA ((ei)->max_size_allocated_);	\
+      ei13newdata = (Ibyte *) ALLOCA ((ei)->max_size_allocated_);	\
       memcpy (ei13newdata, (ei)->data_, (ei)->bytelen_ + 1);		\
       xfree ((ei)->data_);						\
       (ei)->data_ = ei13newdata;					\
@@ -2129,7 +2129,7 @@
 					     Bytecount bytepos,
 					     Charcount n))
 {
-  Intbyte *pos = eistr->data_ + bytepos;
+  Ibyte *pos = eistr->data_ + bytepos;
   Charcount i;

   text_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_);
@@ -2138,10 +2138,10 @@
      call to bytecount_to_charcount(), which would be needlessly
      expensive (it would convert O(N) algorithms into O(N^2) algorithms
      with ERROR_CHECK_TEXT, which would be bad).  If N is bad, we are
-     guaranteed to catch it either inside INC_CHARPTR() or in the check
+     guaranteed to catch it either inside INC_IBYTEPTR() or in the check
      below. */
   for (i = 0; i < n; i++)
-    INC_CHARPTR (pos);
+    INC_IBYTEPTR (pos);
   text_checking_assert (pos - eistr->data_ <= eistr->bytelen_);
   return pos - eistr->data_;
 }
@@ -2153,14 +2153,14 @@
 					     Bytecount bytepos,
 					     Charcount n))
 {
-  Intbyte *pos = eistr->data_ + bytepos;
+  Ibyte *pos = eistr->data_ + bytepos;
   int i;

   text_checking_assert (bytepos >= 0 && bytepos <= eistr->bytelen_);
   text_checking_assert (n >= 0 && n <= eistr->charlen_);
   /* We could check N more correctly now, but ...  see above. */
   for (i = 0; i < n; i++)
-    DEC_CHARPTR (pos);
+    DEC_IBYTEPTR (pos);
   text_checking_assert (pos - eistr->data_ <= eistr->bytelen_);
   return pos - eistr->data_;
 }
@@ -2172,8 +2172,8 @@
 /*   ----- Getting the character at a position -----   */

 #define eigetch(ei, bytepos) \
-  charptr_emchar ((ei)->data_ + (bytepos))
-#define eigetch_char(ei, charpos) charptr_emchar_n ((ei)->data_, charpos)
+  itext_ichar ((ei)->data_ + (bytepos))
+#define eigetch_char(ei, charpos) itext_ichar_n ((ei)->data_, charpos)


 /*   ----- Setting the character at a position -----   */
@@ -2209,20 +2209,20 @@
 								\
   EI_ASSERT_ASCII (ei15, ei15len);				\
   eicat_1 (ei, ei15, ei15len,					\
-           bytecount_to_charcount ((Intbyte *) ei15, ei15len));	\
+           bytecount_to_charcount ((Ibyte *) ei15, ei15len));	\
 } while (0)

 #define eicat_raw(ei, data, len)			\
 do {							\
   int ei16len = (len);					\
-  const Intbyte *ei16data = (data);			\
+  const Ibyte *ei16data = (data);			\
   eicat_1 (ei, ei16data, ei16len,			\
            bytecount_to_charcount (ei16data, ei16len));	\
 } while (0)

 #define eicat_rawz(ei, ptr)				\
 do {							\
-  const Intbyte *ei16p5ptr = (ptr);			\
+  const Ibyte *ei16p5ptr = (ptr);			\
   eicat_raw (ei, ei16p5ptr, qxestrlen (ei16p5ptr));	\
 } while (0)

@@ -2235,8 +2235,8 @@

 #define eicat_ch(ei, ch)				\
 do {							\
-  Intbyte ei22ch[MAX_EMCHAR_LEN];			\
-  Bytecount ei22len = set_charptr_emchar (ei22ch, ch);	\
+  Ibyte ei22ch[MAX_ICHAR_LEN];			\
+  Bytecount ei22len = set_itext_ichar (ei22ch, ch);	\
   eicat_1 (ei, ei22ch, ei22len, 1);			\
 } while (0)

@@ -2253,7 +2253,7 @@
   int ei18charoff = (charoff);						 \
   int ei18len = (len);							 \
   int ei18charlen = (charlen);						 \
-  Intbyte *ei18src = (Intbyte *) (src);					 \
+  Ibyte *ei18src = (Ibyte *) (src);					 \
   int ei18srclen = (srclen);						 \
   int ei18srccharlen = (srccharlen);					 \
 									 \
@@ -2291,8 +2291,8 @@

 #define eisub_ch(ei, off, charoff, len, charlen, ch)		\
 do {								\
-  Intbyte ei21ch[MAX_EMCHAR_LEN];				\
-  Bytecount ei21len = set_charptr_emchar (ei21ch, ch);		\
+  Ibyte ei21ch[MAX_ICHAR_LEN];				\
+  Bytecount ei21len = set_itext_ichar (ei21ch, ch);		\
   eisub_1 (ei, off, charoff, len, charlen, ei21ch, ei21len, 1);	\
 } while (0)

@@ -2385,7 +2385,7 @@
 /*   ----- Comparison -----   */

 int eicmp_1 (Eistring *ei, Bytecount off, Charcount charoff,
-	     Bytecount len, Charcount charlen, const Intbyte *data,
+	     Bytecount len, Charcount charlen, const Ibyte *data,
 	     const Eistring *ei2, int is_c, int fold_case);

 #define eicmp_ei(eistr, eistr2) \
@@ -2417,14 +2417,14 @@

 /*   ----- Case-changing the Eistring -----   */

-int eistr_casefiddle_1 (Intbyte *olddata, Bytecount len, Intbyte *newdata,
+int eistr_casefiddle_1 (Ibyte *olddata, Bytecount len, Ibyte *newdata,
 			int downp);

 #define EI_CASECHANGE(ei, downp)					\
 do {									\
-  int ei11new_allocmax = (ei)->charlen_ * MAX_EMCHAR_LEN + 1;		\
-  Intbyte *ei11storage =						\
-     (Intbyte *) alloca_array (Intbyte, ei11new_allocmax);	\
+  int ei11new_allocmax = (ei)->charlen_ * MAX_ICHAR_LEN + 1;		\
+  Ibyte *ei11storage =						\
+     (Ibyte *) alloca_array (Ibyte, ei11new_allocmax);	\
   int ei11newlen = eistr_casefiddle_1 ((ei)->data_, (ei)->bytelen_,	\
 				       ei11storage, downp);		\
 									\
@@ -2749,7 +2749,7 @@
   ((dfc_aliasing_voidpp) &(sink))->p = dfc_sink_ret;			\
 } while (0)
 #define DFC_LISP_STRING_USE_CONVERTED_DATA(sink) \
-  sink = make_string ((Intbyte *) dfc_sink.data.ptr, dfc_sink.data.len)
+  sink = make_string ((Ibyte *) dfc_sink.data.ptr, dfc_sink.data.len)
 #define DFC_LISP_OPAQUE_USE_CONVERTED_DATA(sink) \
   sink = make_opaque (dfc_sink.data.ptr, dfc_sink.data.len)
 #define DFC_LISP_LSTREAM_USE_CONVERTED_DATA(sink) /* data already used */
@@ -2804,7 +2804,7 @@
 								\
   if (!__gserr__)						\
     {								\
-      var = alloca_intbytes (99);			\
+      var = alloca_ibytes (99);			\
       qxesprintf (var, "Unknown error %d", __gsnum__);		\
     }								\
   else								\
--- a/src/toolbar-common.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/toolbar-common.c	Wed Jun 05 09:58:45 2002 +0000
@@ -274,7 +274,7 @@
 	  struct display_line dl;
 	  Lisp_Object string = IMAGE_INSTANCE_TEXT_STRING (p);
 	  unsigned char charsets[NUM_LEADING_BYTES];
-	  Emchar_dynarr *buf;
+	  Ichar_dynarr *buf;
 	  struct font_metric_info fm;

 	  /* This could be true if we were called via the Expose event
@@ -286,10 +286,10 @@
 	      MARK_TOOLBAR_CHANGED;
 	      return;
 	    }
-	  buf = Dynarr_new (Emchar);
-	  convert_intbyte_string_into_emchar_dynarr
+	  buf = Dynarr_new (Ichar);
+	  convert_ibyte_string_into_ichar_dynarr
 	    (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
-	  find_charsets_in_emchar_string (charsets, Dynarr_atp (buf, 0),
+	  find_charsets_in_ichar_string (charsets, Dynarr_atp (buf, 0),
 					  Dynarr_length (buf));
 	  ensure_face_cachel_complete (cachel, window, charsets);
 	  face_cachel_charset_font_metric_info (cachel, charsets, &fm);
--- a/src/tooltalk.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/tooltalk.c	Wed Jun 05 09:58:45 2002 +0000
@@ -296,7 +296,7 @@
 {
   if (tt_is_err (st))
     {
-      CIntbyte *err;
+      CIbyte *err;

       EXTERNAL_TO_C_STRING (tt_status_message (st), err, Qnative);
       signal_error (Qtooltalk_error, err, Qunbound);
@@ -527,7 +527,7 @@
 tt_message_arg_bval_vector (Tt_message m, int n)
 {
   /* !!#### This function has not been Mule-ized */
-  Intbyte *value;
+  Ibyte *value;
   int len = 0;

   check_status (tt_message_arg_bval (m, n, &value, &len));
--- a/src/ui-gtk.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/ui-gtk.c	Wed Jun 05 09:58:45 2002 +0000
@@ -1525,7 +1525,7 @@
       return (0);
     case GTK_TYPE_CHAR:
       {
-	Emchar c;
+	Ichar c;

 	CHECK_CHAR_COERCE_INT (obj);
 	c = XCHAR (obj);
@@ -1534,7 +1534,7 @@
       break;
     case GTK_TYPE_UCHAR:
       {
-	Emchar c;
+	Ichar c;

 	CHECK_CHAR_COERCE_INT (obj);
 	c = XCHAR (obj);
--- a/src/unexnt.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/unexnt.c	Wed Jun 05 09:58:45 2002 +0000
@@ -176,14 +176,14 @@

 /* Dump out .data and .bss sections into a new executable.  */
 int
-unexec (Intbyte *new_name, Intbyte *old_name, unsigned int start_data,
+unexec (Ibyte *new_name, Ibyte *old_name, unsigned int start_data,
 	unsigned int start_bss, unsigned int entry_address)
 {
   file_data in_file, out_file;
-  Intbyte *out_filename = alloca_intbytes (qxestrlen (new_name) + 10);
-  Intbyte *in_filename = alloca_intbytes (qxestrlen (old_name) + 10);
+  Ibyte *out_filename = alloca_ibytes (qxestrlen (new_name) + 10);
+  Ibyte *in_filename = alloca_ibytes (qxestrlen (old_name) + 10);
   unsigned long size;
-  Intbyte *ptr;
+  Ibyte *ptr;
   HINSTANCE hImagehelp;

   /* Make sure that the input and output filenames have the
@@ -286,7 +286,7 @@
 			    DWORD *p_bss_size)
 {
   int n, start, len;
-  Intbyte *map_filename = alloca_intbytes (qxestrlen (p_infile->name) + 10);
+  Ibyte *map_filename = alloca_ibytes (qxestrlen (p_infile->name) + 10);
   Extbyte buffer[256];
   FILE *map;
--- a/src/unicode.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/unicode.c	Wed Jun 05 09:58:45 2002 +0000
@@ -61,7 +61,7 @@

      -- If from_unicode_levels == 1, from_unicode_table is a 256-element
      array of shorts (octet 1 in high byte, octet 2 in low byte; we don't
-     store Emchars directly to save space).
+     store Ichars directly to save space).

      -- If from_unicode_levels == 2, from_unicode_table is a
      256-element array of short * pointers, each of which points to a
@@ -586,8 +586,8 @@
 		Lisp_Object char_charset;
 		int c1, c2;

-		assert (valid_emchar_p (tab[i]));
-		BREAKUP_EMCHAR (tab[i], char_charset, c1, c2);
+		assert (valid_ichar_p (tab[i]));
+		BREAKUP_ICHAR (tab[i], char_charset, c1, c2);
 		assert (EQ (charset, char_charset));
 		if (XCHARSET_DIMENSION (charset) == 1)
 		  {
@@ -669,15 +669,15 @@
 	    if (tab[i] != -1)
 	      {
 		int u4, u3, u2, u1, levels;
-		Emchar ch;
-		Emchar this_ch;
+		Ichar ch;
+		Ichar this_ch;
 		short val;
 		void *frtab = XCHARSET_FROM_UNICODE_TABLE (charset);

 		if (XCHARSET_DIMENSION (charset) == 1)
-		  this_ch = make_emchar (charset, i + 32, 0);
+		  this_ch = make_ichar (charset, i + 32, 0);
 		else
-		  this_ch = make_emchar (charset, codetop + 32, i + 32);
+		  this_ch = make_ichar (charset, codetop + 32, i + 32);

 		assert (tab[i] >= 0);
 		BREAKUP_UNICODE_CODE (tab[i], u4, u3, u2, u1, levels);
@@ -692,7 +692,7 @@
 		  default: abort ();
 		  }

-		ch = make_emchar (charset, val >> 8, val & 0xFF);
+		ch = make_ichar (charset, val >> 8, val & 0xFF);
 		assert (ch == this_ch);

 		switch (XCHARSET_FROM_UNICODE_LEVELS (charset))
@@ -776,12 +776,12 @@
 #endif /* SLEDGEHAMMER_CHECK_UNICODE */

 static void
-set_unicode_conversion (Emchar chr, int code)
+set_unicode_conversion (Ichar chr, int code)
 {
   Lisp_Object charset;
   int c1, c2;

-  BREAKUP_EMCHAR (chr, charset, c1, c2);
+  BREAKUP_ICHAR (chr, charset, c1, c2);

   assert (!EQ (charset, Vcharset_ascii));
   assert (!EQ (charset, Vcharset_control_1));
@@ -913,16 +913,16 @@
 }

 int
-emchar_to_unicode (Emchar chr)
+ichar_to_unicode (Ichar chr)
 {
   Lisp_Object charset;
   int c1, c2;

-  type_checking_assert (valid_emchar_p (chr));
+  type_checking_assert (valid_ichar_p (chr));
   if (chr < 256)
     return (int) chr;

-  BREAKUP_EMCHAR (chr, charset, c1, c2);
+  BREAKUP_ICHAR (chr, charset, c1, c2);
   if (EQ (charset, Vcharset_composite))
     return -1; /* #### don't know how to handle */
   else if (XCHARSET_DIMENSION (charset) == 1)
@@ -931,7 +931,7 @@
     return ((int **) XCHARSET_TO_UNICODE_TABLE (charset))[c1 - 32][c2 - 32];
 }

-static Emchar
+static Ichar
 unicode_to_char (int code, Lisp_Object_dynarr *charsets)
 {
   int u1, u2, u3, u4;
@@ -941,7 +941,7 @@

   type_checking_assert (code >= 0);
   if (code < 256)
-    return (Emchar) code;
+    return (Ichar) code;

   BREAKUP_UNICODE_CODE (code, u4, u3, u2, u1, code_levels);

@@ -964,11 +964,11 @@
 	    }

 	  if (retval != -1)
-	    return make_emchar (charset, retval >> 8, retval & 0xFF);
+	    return make_ichar (charset, retval >> 8, retval & 0xFF);
 	}
     }

-  return (Emchar) -1;
+  return (Ichar) -1;
 }

 static void
@@ -1100,7 +1100,7 @@
   CHECK_CHAR (character);
   CHECK_NATNUM (code);

-  charset = emchar_charset (XCHAR (character));
+  charset = ichar_charset (XCHAR (character));
   if (EQ (charset, Vcharset_ascii) ||
       EQ (charset, Vcharset_control_1) ||
       EQ (charset, Vcharset_composite))
@@ -1122,7 +1122,7 @@
 {
   CHECK_CHAR (character);
 #ifdef MULE
-  return make_int (emchar_to_unicode (XCHAR (character)));
+  return make_int (ichar_to_unicode (XCHAR (character)));
 #else
   return Fchar_to_int (character);
 #endif /* MULE */
@@ -1156,7 +1156,7 @@

   if (NILP (charsets))
     {
-      Emchar ret = unicode_to_char (c, unicode_precedence_dynarr);
+      Ichar ret = unicode_to_char (c, unicode_precedence_dynarr);
       if (ret == -1)
 	return Qnil;
       return make_char (ret);
@@ -1166,7 +1166,7 @@
   memset (lbs, 0, NUM_LEADING_BYTES * sizeof (int));
   add_charsets_to_precedence_list (charsets, lbs, dyn);
   {
-    Emchar ret = unicode_to_char (c, unicode_precedence_dynarr);
+    Ichar ret = unicode_to_char (c, unicode_precedence_dynarr);
     Dynarr_free (dyn);
     if (ret == -1)
       return Qnil;
@@ -1323,7 +1323,7 @@

 	  if (big5)
 	    {
-	      Emchar ch = decode_big5_char (cp1high, cp1low);
+	      Ichar ch = decode_big5_char (cp1high, cp1low);
 	      if (ch == -1)

 		warn_when_safe (Qunicode, Qwarning,
@@ -1336,7 +1336,7 @@
 	  else
 	    {
 	      int l1, h1, l2, h2;
-	      Emchar emch;
+	      Ichar emch;

 	      switch (XCHARSET_TYPE (charset))
 		{
@@ -1352,8 +1352,8 @@
 	      if (cp1high < l2 || cp1high > h2 || cp1low < l1 || cp1low > h1)
 		goto out_of_range;

-	      emch = (cp1high == 0 ? make_emchar (charset, cp1low, 0) :
-		      make_emchar (charset, cp1high, cp1low));
+	      emch = (cp1high == 0 ? make_ichar (charset, cp1low, 0) :
+		      make_ichar (charset, cp1high, cp1low));
 	      set_unicode_conversion (emch, cp2);
 	    }
 	}
@@ -1434,14 +1434,14 @@
   else
     {
 #ifdef MULE
-      Emchar chr = unicode_to_char (ch, unicode_precedence_dynarr);
+      Ichar chr = unicode_to_char (ch, unicode_precedence_dynarr);

       if (chr != -1)
 	{
-	  Intbyte work[MAX_EMCHAR_LEN];
+	  Ibyte work[MAX_ICHAR_LEN];
 	  int len;

-	  len = set_charptr_emchar (work, chr);
+	  len = set_itext_ichar (work, chr);
 	  Dynarr_add_many (dst, work, len);
 	}
       else
@@ -1451,7 +1451,7 @@
 	  Dynarr_add (dst, 46 + 128);
 	}
 #else
-      Dynarr_add (dst, (Intbyte) ch);
+      Dynarr_add (dst, (Ibyte) ch);
 #endif /* MULE */
     }

@@ -1548,7 +1548,7 @@
 		     int little_endian)
 {
 #ifdef MULE
-  int code = emchar_to_unicode (make_emchar (charset, h & 127, l & 127));
+  int code = ichar_to_unicode (make_ichar (charset, h & 127, l & 127));

   if (code == -1)
     {
@@ -1697,7 +1697,7 @@
       /* flags for handling composite chars.  We do a little switcheroo
 	 on the source while we're outputting the composite char. */
       Bytecount saved_n = 0;
-      const Intbyte *saved_src = NULL;
+      const Ibyte *saved_src = NULL;
       int in_composite = 0;

     back_to_square_n:
@@ -1711,7 +1711,7 @@

       while (n--)
 	{
-	  Intbyte c = *src++;
+	  Ibyte c = *src++;

 #ifdef MULE
 	  if (byte_ascii_p (c))
@@ -1724,7 +1724,7 @@
 	      char_boundary = 1;
 	    }
 #ifdef MULE
-	  else if (intbyte_leading_byte_p (c) || intbyte_leading_byte_p (ch))
+	  else if (ibyte_leading_byte_p (c) || ibyte_leading_byte_p (ch))
 	    {			/* Processing Leading Byte */
 	      ch = 0;
 	      charset = charset_by_leading_byte (c);
@@ -1768,7 +1768,7 @@
 				}
 			      else
 				{
-				  Emchar emch = make_emchar (Vcharset_composite,
+				  Ichar emch = make_ichar (Vcharset_composite,
 							   ch & 0x7F,
 							   c & 0x7F);
 				  Lisp_Object lstr =
--- a/src/win32.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/win32.c	Wed Jun 05 09:58:45 2002 +0000
@@ -47,13 +47,13 @@
    #### This comes from code that just prepended `file:', which is not
    good.  See comment in mswindows_dde_callback(), case XTYP_EXECUTE.
   */
-Intbyte *
-urlify_filename (Intbyte *filename)
+Ibyte *
+urlify_filename (Ibyte *filename)
 {
-  Intbyte *pseudo_url;
+  Ibyte *pseudo_url;

   WIN32_TO_LOCAL_FILE_FORMAT (filename, filename);
-  pseudo_url = xnew_array (Intbyte, 5 + qxestrlen (filename) + 1);
+  pseudo_url = xnew_array (Ibyte, 5 + qxestrlen (filename) + 1);
   qxestrcpy_c (pseudo_url, "file:");
   qxestrcat (pseudo_url, filename);
   /* URL's only have /, no backslash */
@@ -72,7 +72,7 @@
 Lisp_Object
 tstr_to_local_file_format (Extbyte *path)
 {
-  Intbyte *ttlff;
+  Ibyte *ttlff;

   TSTR_TO_C_STRING (path, ttlff);
   WIN32_TO_LOCAL_FILE_FORMAT (ttlff, ttlff);
@@ -85,10 +85,10 @@
    components to lower case.  Return a newly malloc()ed string.
 */

-Intbyte *
-mswindows_canonicalize_filename (Intbyte *name)
+Ibyte *
+mswindows_canonicalize_filename (Ibyte *name)
 {
-  Intbyte *fp = name;
+  Ibyte *fp = name;
   DECLARE_EISTRING (newname);
   DECLARE_EISTRING (component);
   int do_casefrob = 1;
@@ -107,7 +107,7 @@

   while (1)
     {
-      Emchar ch = charptr_emchar (fp);
+      Ichar ch = itext_ichar (fp);
       if (LOWERCASEP (0, ch))
 	do_casefrob = 0;	/* don't convert this element */

@@ -128,7 +128,7 @@
       else
 	eicat_ch (component, ch);

-      INC_CHARPTR (fp);
+      INC_IBYTEPTR (fp);
     }

   return eicpyout_malloc (newname, 0);
@@ -182,7 +182,7 @@
 {
   LPTSTR lpMsgBuf;
   Lisp_Object result;
-  Intbyte *inres;
+  Ibyte *inres;
   Bytecount len;
   int i;

@@ -375,7 +375,7 @@
 */
        (path))
 {
-  Intbyte *p;
+  Ibyte *p;
   CHECK_STRING (path);

   /* There appears to be a bug in the cygwin conversion routines in