Commits

Anonymous committed 78f53ef

Import from CVS: tag r20-4b5

  • Participants
  • Parent commits d8688ac
  • Tags r20-4b5

Comments (0)

Files changed (118)

File CHANGES-beta

 							-*- indented-text -*-
+to 20.4 beta5 "Anglo-Nubian"
+-- CCL synched with Emacs 20.2 courtesy of Olivier Galibert
+-- various updates from Hrvoje Niksic and Kyle Jones
+-- MS Windows updates from Marc Paquette and Jonathon Harris
+-- FAQ update courtesy of Andreas Kaempf
+-- miscellaneous bug fixes
+
 to 20.4 beta4 "American Cashmere"
 -- Major changes in portable dumping/Lisp_Object code courtesy of Kyle Jones
 -- Miscellaneous patches from Kyle Jones, Hrvoje Niksic
+1997-11-13  Marc Paquette <marcpa@cam.org>
+
+	* nt/Todo: added a task for support of lisp packages through
+	the registry.
+
+1997-11-13  Jonathan Harris <jhar@tardis.ed.ac.uk>
+
+	* Renamed files *w32* to *msw*
+
+	* Changed 'w32' and 'win32' to 'mswindows', and HAVE_W32GUI to
+	  HAVE_MS_WINDOWS. Changed files:
+	  cus-edit.el, device.el, faces.el, frame.el, msw-faces.el,
+	  msw.init.el, igrep.el, dumped-lisp.el, font.el, hippie-exp.el,
+	  sysdep.el, console-msw.c, console-msw.h, console.c,
+	  device-msw.c, emacs.c, event-msw.c, event-msw.h, event-stream.c,
+	  events.c, events.h, faces.c, frame-msw.c, frame.c, general.c,
+	  msw-proc.c, objects-msw.c, objects-msw.h, redisplay-msw.c,
+	  redisplay.c, symsinit.h, 
+
+	* Didn't change 'win32' in nt.c, nt.h, ntproc.c
+
+	* Deleted w32 build directory since nt build directory now handles
+	  X and native mswindows builds.
+
 1997-11-10  SL Baur  <steve@altair.xemacs.org>
 
 	* info/dir: remove packaged entries.
 rm -f conftest*
 fi
 
-echo $ac_n "checking whether the timezone variable is already declared""... $ac_c" 1>&6
-echo "configure:7585: checking whether the timezone variable is already declared" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7587 "configure"
-#include "confdefs.h"
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-  
-int main() {
-
-  timezone = 0;
-
-; return 0; }
-EOF
-if { (eval echo configure:7607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-   { test "$extra_verbose" = "yes" && cat << \EOF
-    Defining HAVE_TIMEZONE_DECL
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_TIMEZONE_DECL 1
-EOF
-}
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-fi
-rm -f conftest*
-
-
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:7629: checking for inline" >&5
+echo "configure:7586: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 7634 "configure"
+#line 7591 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:7641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
 # 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:7691: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7694 "configure"
+echo "configure:7648: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7651 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7725: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7728 "configure"
+echo "configure:7682: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7685 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7790: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7793 "configure"
+echo "configure:7747: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7750 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 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:7817: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7820 "configure"
+echo "configure:7774: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7777 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:7843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7873: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7876 "configure"
+echo "configure:7830: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7833 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:7923: checking for vfork.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7926 "configure"
+echo "configure:7880: checking for vfork.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7883 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:7959: checking for working vfork" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7962 "configure"
+echo "configure:7916: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7919 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
   }
 }
 EOF
-if { (eval echo configure:8057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:8082: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8085 "configure"
+echo "configure:8039: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8042 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:8095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8122: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8125 "configure"
+echo "configure:8079: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8082 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:8148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:8176: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8179 "configure"
+echo "configure:8133: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8136 "configure"
 #include "confdefs.h"
 
 /*
 }
 
 EOF
-if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:8260: checking for working mmap" >&5
+echo "configure:8217: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 8263 "configure"
+#line 8220 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
   return 1;
 }
 EOF
-if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   have_mmap=yes
 else
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:8330: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8333 "configure"
+echo "configure:8287: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8290 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   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:8381: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8384 "configure"
+echo "configure:8338: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8341 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:8421: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8424 "configure"
+echo "configure:8378: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8381 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:8447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
   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:8462: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8465 "configure"
+echo "configure:8419: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8422 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   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:8487: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8490 "configure"
+echo "configure:8444: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8447 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:8520: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:8477: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 8522 "configure"
+#line 8479 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:8533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:8564: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8567 "configure"
+echo "configure:8521: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8524 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:8590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
   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:8605: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8608 "configure"
+echo "configure:8562: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8565 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   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:8630: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8633 "configure"
+echo "configure:8587: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8590 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:8676: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8679 "configure"
+echo "configure:8633: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8636 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   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:8711: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8714 "configure"
+echo "configure:8668: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8671 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:8752: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8755 "configure"
+echo "configure:8709: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8712 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:8790: checking "for sound support"" >&5
+echo "configure:8747: checking "for sound support"" >&5
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
     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:8801: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8804 "configure"
+echo "configure:8758: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8761 "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:8809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:8857: checking for ALopenport in -laudio" >&5
+echo "configure:8814: 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 8862 "configure"
+#line 8819 "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
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:8904: checking for AOpenAudio in -lAlib" >&5
+echo "configure:8861: 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 8909 "configure"
+#line 8866 "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
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:8920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
     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:8958: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8961 "configure"
+echo "configure:8915: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8918 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
  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 9036 "configure"
+#line 8993 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:9063: checking for TTY-related features" >&5
+echo "configure:9020: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:9079: checking for tgetent in -lncurses" >&5
+echo "configure:9036: 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 9084 "configure"
+#line 9041 "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
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:9128: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9131 "configure"
+echo "configure:9085: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9088 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:9158: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9161 "configure"
+echo "configure:9115: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9118 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
       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:9196: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9199 "configure"
+echo "configure:9153: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9156 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:9239: checking for tgetent in -l$lib" >&5
+echo "configure:9196: 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 9244 "configure"
+#line 9201 "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
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:9286: checking for tgetent in -lcurses" >&5
+echo "configure:9243: 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 9291 "configure"
+#line 9248 "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
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:9320: checking for tgetent in -ltermcap" >&5
+echo "configure:9277: 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 9325 "configure"
+#line 9282 "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
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
 
     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:9384: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9387 "configure"
+echo "configure:9341: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9344 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:9415: checking for Gpm_Open in -lgpm" >&5
+echo "configure:9372: 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 9420 "configure"
+#line 9377 "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
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:9431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
 
 
 echo "checking for database support" 1>&6
-echo "configure:9480: checking for database support" >&5
+echo "configure:9437: checking for database support" >&5
 
 if test "$with_database_gnudbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:9485: checking for dbm_open in -lgdbm" >&5
+echo "configure:9442: 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 9490 "configure"
+#line 9447 "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
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
 
   if test "$with_database_gnudbm" != "yes"; then
     echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9523: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9526 "configure"
+echo "configure:9480: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9483 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:9549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9585: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9588 "configure"
+echo "configure:9542: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9545 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:9611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
   if test "$need_libdbm" != "no"; then
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:9632: checking for dbm_open in -ldbm" >&5
+echo "configure:9589: 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 9637 "configure"
+#line 9594 "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
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:9685: checking for dbopen" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9688 "configure"
+echo "configure:9642: checking for dbopen" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9645 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbopen(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbopen=yes"
 else
   if test "$need_libdb" != "no"; then
     
 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:9732: checking for dbopen in -ldb" >&5
+echo "configure:9689: checking for dbopen in -ldb" >&5
 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 9737 "configure"
+#line 9694 "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
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:9748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   if test "$with_database_berkdb" = "yes"; then
     for path in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 9772 "configure"
+#line 9729 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 
 ; return 0; }
 EOF
-if { (eval echo configure:9790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_path="$path"; break
 else
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:9842: checking for SOCKSinit in -lsocks" >&5
+echo "configure:9799: 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 9847 "configure"
+#line 9804 "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
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:9858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else

File configure.in

    AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)])
 fi
 
-AC_MSG_CHECKING(whether the timezone variable is already declared)
-AC_TRY_LINK([
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-  ],
-  [
-  timezone = 0;
-],
-  [AC_MSG_RESULT(yes)
-   AC_DEFINE(HAVE_TIMEZONE_DECL)],
-  [AC_MSG_RESULT(no)])
-
-
 
 AC_C_INLINE
 if test "$ac_cv_c_inline" != "no"; then

File lib-src/ChangeLog

+1997-11-13  SL Baur  <steve@altair.xemacs.org>
+
+	* pop.c: Add includes from movemail.c so standard functions get
+	declared.
+	(pop_retrieve): Return NULL if falling off the end of the
+	function.
+
+	* movemail.c: Hide declarations of popmail(), mbx_write(),
+	mbc_delimit_begin(), and mbx_delimit_end() behind MAIL_USE_POP
+	guard.
+	(pop_retr): Change 4th parameter to void *.
+
 1997-11-02  SL Baur  <steve@altair.xemacs.org>
 
 	* update-custom.sh (dirs): Remove packaged directories.

File lib-src/movemail.c

 static void pfatal_and_delete (char *);
 static char *concat (char *, char *, char *);
 static long *xmalloc (unsigned int);
+#ifdef MAIL_USE_POP
 static int popmail (char *, char *, char *);
-#ifdef MAIL_USE_POP
-static int pop_retr (popserver server, int msgno, int (*action)(), int arg);
-#endif
+static int pop_retr (popserver server, int msgno, int (*action)(), void *arg);
 static int mbx_write (char *, FILE *);
 static int mbx_delimit_begin (FILE *);
 static int mbx_delimit_end (FILE *);
+#endif
 
 /* Nonzero means this is name of a lock file to delete on fatal error.  */
 char *delete_lockname;
   int mbfi;
   FILE *mbf;
   char *getenv ();
-  int mbx_write ();
   popserver server;
   extern char *strerror ();
 
 }
 
 static int
-pop_retr (popserver server, int msgno, int (*action)(), int arg)
+pop_retr (popserver server, int msgno, int (*action)(), void *arg)
 {
   char *line;
   int ret;

File lib-src/pop.c

 #include <errno.h>
 #include <stdio.h>
 
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include "../src/syswait.h"
+#include "../src/systime.h"
+#include <stdlib.h>
+#include <string.h>
+
 #ifdef KERBEROS
 #ifndef KRB5
 #include <des.h>
   if (ret)
     {
       free (ptr);
-      return (0);
+      /* return (0); */
     }
+  /* This function used to fall off the end, but that doesn't make any sense */
+  return (0);
 }     
 
 int

File lisp/ChangeLog

+1997-11-15  SL Baur  <steve@altair.xemacs.org>
+
+	* packages.el (list-autoloads): Fix typo (I hope). [Doesn't work]
+
+1997-11-14  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* custom/wid-edit.el (widget-before-change): Check for inactive
+	editable fields.
+
+1997-11-13  SL Baur  <steve@altair.xemacs.org>
+
+	* prim/about.el (about-xemacs): Update maintainers.
+
+1997-11-12  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* custom/cus-edit.el (custom-face-save): Save the face.
+
+1997-11-13  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* packages/font-lock.el (font-lock-fontify-keywords-region):
+	  If not fontifying a MATCH-ANCHORED style keyword,
+	  backtrack to just after the end of the keyword before
+	  doing the next search.
+
+1997-11-13  Olivier Galibert  <olivier.galibert@mines.u-nancy.fr>
+
+	* language/vietnamese.el: Synched ccl with FSF 20.2.
+
+	* language/cyrillic.el: Synched ccl with FSF 20.2.
+
+	* language/chinese.el: Synched ccl with FSF 20.2.
+
+	* mule/mule-ccl.el: Synched with FSF 20.2.
+
+1997-11-12  SL Baur  <steve@altair.xemacs.org>
+
+	* leim/quail.el (quail-translation-keymap): Guard against
+	meta-prefix-char being -1 (documented as disabling it :-().
+	(quail-simple-translation-keymap): Ditto.
+	(quail-conversion-keymap): Ditto.
+
+1997-11-11  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* custom/cus-face.el (custom-face-attributes): Use
+ 	`set-face-stipple' instead of `set-face-background-pixmap'.
+
+	* prim/faces.el (set-face-stipple): Search through
+	x-bitmap-file-path.
+
+1997-11-09  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* speedbar/speedbar.el (speedbar-needed-height): New function.
+	(speedbar-frame-mode): Use it.
+
+1997-11-07  Karl M. Hegbloom  <karlheg@inetarena.com>
+
+	* speedbar/speedbar.el: Various docfixes.
+
+1997-11-12  SL Baur  <steve@altair.xemacs.org>
+
+	* pcl-cvs/pcl-cvs-xemacs.el: Fix emerge menu item.
+	From Jens Krinke <krinke@ips.cs.tu-bs.de>
+
+	* mule/mule-cmds.el (set-language-info): Don't add mule menu if
+	menubars haven't been compiled in.
+
+1997-11-10  Jens-Ulrik Holger Petersen  <petersen@kurims.kyoto-u.ac.jp>
+
+	* custom/cus-edit.el (custom-file): Use `user-init-directory'
+	instead of `emacs-user-extension-dir'.
+
+1997-11-12  SL Baur  <steve@altair.xemacs.org>
+
+	* modes/image-mode.el: Add command to enter xpm mode when viewing XPM
+	image.
+	From:  Jens Krinke <krinke@ips.cs.tu-bs.de>
+
+1997-11-12  Greg Klanderman  <greg@alphatech.com>
+
+	* packages/compile.el (compilation-build-compilation-error-regexp-alist): 
+	Added documentation for this function.
+	
+	** (compilation-error-regexp-systems-list): Update documentation
+ 	to note that `compilation-build-compilation-error-regexp-alist'
+ 	must be called after changing the value.  Update customization to
+ 	add a set method which automatically calls
+ 	`compilation-build-compilation-error-regexp-alist' when the value
+ 	is set by custom.  Move declaration below declarations that it now
+ 	depends upon.
+
+	** (compilation-mouse-motion-initiate-parsing): Default to nil.
+
 1997-11-12  Hrvoje Niksic  <hniksic@srce.hr>
 
 	* help.el (help-for-help): Use `make-help-screen'.
 	* Added file headers to:
 	  w32-faces.el, w32-init.el
 
+1997-11-06  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* facemenu.el (facemenu-insert-menu-entry): Check for
+	menubar availability.
+
+	* easymenu.el (easy-menu-change): Check for menubar
+	availability.
+
+	* wid-edit.el (widget-echo-help): Use `help-echo' as label
+	for help-echo messages.
+
 Sun Nov 01 12:00:00 1997 Jonathan Harris  <jhar@tardis.ed.ac.uk>
 
 	* make-docfile.el: Fixed typo when dumped file does not exist.

File lisp/cus-edit.el

 					   :sibling-args (:help-echo "\
 OS/2 Presentation Manager")
 					   pm)
-				    (const :format "Win32 "
+				    (const :format "MSWindows "
 					   :sibling-args (:help-echo "\
 Windows NT/95/97")
-					   win32)
+					   mswindows)
 				    (const :format "DOS "
 					   :sibling-args (:help-echo "\
 Plain MS-DOS")
     (face-spec-set symbol value)
     (put symbol 'saved-face value)
     (put symbol 'customized-face nil)
+    (custom-save-all)
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 
 
 ;;; The `custom-save-all' Function.
 ;;;###autoload
-(defcustom custom-file (if (boundp 'emacs-user-extension-dir)
+(defcustom custom-file (if (boundp 'user-init-directory)
 			   (concat "~"
 				   init-file-user
-				   emacs-user-extension-dir
+				   user-init-directory
 				   "options.el")
 			 "~/.emacs")
   "File used for storing customization information.

File lisp/cus-face.el

 		    set-face-reverse-p face-reverse-p)
     (:stipple (editable-field :format "Stipple: %v"
 			      :help-echo "Name of background bitmap file.")
-	      set-face-background-pixmap custom-face-stipple)
+	      set-face-stipple custom-face-stipple)
     (:family (editable-field :format "Font Family: %v"
 			     :help-echo "\
 Name of font family to use (e.g. times).") 

File lisp/device.el

 Value is `tty' for a tty device (a character-only terminal),
 `x' for a device that is a screen on an X display,
 `ns' for a device that is a NeXTstep connection (not yet implemented),
-`w32' for a device that is a Windows or Windows NT connection,
+`mswindows' for a device that is a Windows or Windows NT connection,
 `pc' for a device that is a direct-write MS-DOS screen (not yet implemented),
 `stream' for a stream device (which acts like a stdio stream), and
 `dead' for a deleted device."
   "Create a new device connected to DISPLAY."
   (make-device 'x display))
 
-(defun make-w32-device ()
-  "Create a new win32 device."
-  (make-device 'w32 nil))
+(defun make-mswindows-device ()
+  "Create a new mswindows device."
+  (make-device 'mswindows nil))
 
 (defun device-on-window-system-p (&optional device)
   "Return non-nil if DEVICE is on a window system.

File lisp/faces.el

      ;; handle X specific entries
      (cond ((featurep 'x)
 	    (frob-face-property face 'font 'x-make-font-bold locale))
-	   ((featurep 'w32)
-	    (frob-face-property face 'font 'w32-make-font-bold locale))
+	   ((featurep 'mswindows)
+	    (frob-face-property face 'font 'mswindows-make-font-bold locale))
 	   ))
    '(([default] . [bold])
      ([bold] . t)
      ;; handle X specific entries
      (cond ((featurep 'x)
 	    (frob-face-property face 'font 'x-make-font-italic locale))
-	   ((featurep 'w32)
-	    (frob-face-property face 'font 'w32-make-font-italic locale))
+	   ((featurep 'mswindows)
+	    (frob-face-property face 'font 'mswindows-make-font-italic locale))
 	   ))
    '(([default] . [italic])
      ([bold] . [bold-italic])
      ;; handle X specific entries
      (cond ((featurep 'x)
 	    (frob-face-property face 'font 'x-make-font-bold-italic locale))
-	   ((featurep 'w32)
-	    (frob-face-property face 'font 'w32-make-font-bold-italic locale))
+	   ((featurep 'mswindows)
+	    (frob-face-property face 'font 'mswindows-make-font-bold-italic locale))
 	   ))
    '(([default] . [italic])
      ([bold] . [bold-italic])
      ;; handle X specific entries
      (cond ((featurep 'x)
 	    (frob-face-property face 'font 'x-make-font-unbold locale))
-	   ((featurep 'w32)
-	    (frob-face-property face 'font 'w32-make-font-unbold locale))
+	   ((featurep 'mswindows)
+	    (frob-face-property face 'font 'mswindows-make-font-unbold locale))
 	   ))
    '(([default] . t)
      ([bold] . [default])
      ;; handle X specific entries
      (cond ((featurep 'x)
 	    (frob-face-property face 'font 'x-make-font-unitalic locale))
-	   ((featurep 'w32)
-	    (frob-face-property face 'font 'w32-make-font-unitalic locale))
+	   ((featurep 'mswindows)
+	    (frob-face-property face 'font 'mswindows-make-font-unitalic locale))
 	   ))
    '(([default] . t)
      ([bold] . t)
   ;; handle X specific entries
   (cond ((featurep 'x)
 	 (frob-face-property face 'font 'x-find-smaller-font locale))
-	((featurep 'w32)
-	 (frob-face-property face 'font 'w32-find-smaller-font locale))))
+	((featurep 'mswindows)
+	 (frob-face-property face 'font 'mswindows-find-smaller-font locale))))
 
 (defun make-face-larger (face &optional locale)
   "Make the font of the given face be larger, if possible.
   ;; handle X specific entries
   (cond ((featurep 'x)
 	 (frob-face-property face 'font 'x-find-larger-font locale))
-	((featurep 'w32)
-	 (frob-face-property face 'font 'w32-find-larger-font locale))))
+	((featurep 'mswindows)
+	 (frob-face-property face 'font 'mswindows-find-larger-font locale))))
 
 (defun invert-face (face &optional locale)
   "Swap the foreground and background colors of the face."
     ;; Then do any device-specific initialization.
     (cond ((eq 'x (device-type device))
 	   (x-init-device-faces device))
-	  ((eq 'w32 (device-type device))
-	   (w32-init-device-faces device))
+	  ((eq 'mswindows (device-type device))
+	   (mswindows-init-device-faces device))
 	  ;; Nothing to do for TTYs?
 	  )
     (init-other-random-faces device)))
     ;; Then do any frame-specific initialization.
     (cond ((eq 'x (frame-type frame))
 	   (x-init-frame-faces frame))
-	  ((eq 'w32 (frame-type frame))
-	   (w32-init-frame-faces frame))
+	  ((eq 'mswindows (frame-type frame))
+	   (mswindows-init-frame-faces frame))
 	  ;; Is there anything which should be done for TTY's?
 	  )))
 
 	      (face-background 'list-mode-item-selected 'global))
     (set-face-background 'list-mode-item-selected "gray68" 'global 'color)
     (set-face-background 'list-mode-item-selected "gray68" 'global 'grayscale)
-    (if (featurep 'x)
-	(unless (face-foreground 'list-mode-item-selected 'global)
-		(set-face-background 'list-mode-item-selected
-				     [default foreground] 'global '(mono x))
-		(set-face-foreground 'list-mode-item-selected
-				     [default background] 'global '(mono x)))))
+    (unless (face-foreground 'list-mode-item-selected 'global)
+	    (set-face-background 'list-mode-item-selected
+				 [default foreground] 'global '(mono x))
+	    (set-face-foreground 'list-mode-item-selected
+				 [default background] 'global '(mono x))))
 
   ;; if the list-mode-item-selected face isn't distinguished on this device,
   ;; at least try inverting it.
 
 PIXMAP should be a string, the name of a file of pixmap data.
 The directories listed in the `x-bitmap-file-path' variable are searched.
-Any kind of image file for which XEmacs has builtin support can be used.
 
 Alternatively, PIXMAP may be a list of the form (WIDTH HEIGHT
 DATA) where WIDTH and HEIGHT are the size in pixels, and DATA is
 in that frame; otherwise change each frame."
   (while (not (find-face face))
     (setq face (signal 'wrong-type-argument (list 'facep face))))
+  (locate-file pixmap x-bitmap-file-path ".xbm:" 4)
   (while (cond ((stringp pixmap)
 		(unless (file-readable-p pixmap)
 		  (setq pixmap `[xbm :file ,pixmap]))

File lisp/frame.el

   "Create a frame of type TYPE on CONNECTION.
 TYPE should be a symbol naming the device type, i.e. one of
 
-x	An X display.  CONNECTION should be a standard display string
-	such as \"unix:0\", or nil for the display specified on the
-	command line or in the DISPLAY environment variable.  Only if
-	support for X was compiled into	XEmacs.
-tty	A standard TTY connection or terminal.  CONNECTION should be
-	a TTY device name such as \"/dev/ttyp2\" (as determined by
-	the Unix command `tty') or nil for XEmacs' standard input
-	and output (usually the TTY in which XEmacs started).  Only
-	if support for TTY's was compiled into XEmacs.
-ns	A connection to a machine running the NeXTstep windowing
-	system.  Not currently implemented.
-w32	A connection to a machine running Microsoft Windows NT or
-	Windows 95.
-pc	A direct-write MS-DOS frame.  Not currently implemented.
+x	    An X display.  CONNECTION should be a standard display string
+	    such as \"unix:0\", or nil for the display specified on the
+	    command line or in the DISPLAY environment variable.  Only if
+	    support for X was compiled into XEmacs.
+tty	    A standard TTY connection or terminal.  CONNECTION should be
+	    a TTY device name such as \"/dev/ttyp2\" (as determined by
+	    the Unix command `tty') or nil for XEmacs' standard input
+	    and output (usually the TTY in which XEmacs started).  Only
+	    if support for TTY's was compiled into XEmacs.
+ns	    A connection to a machine running the NeXTstep windowing
+	    system.  Not currently implemented.
+mswindows   A connection to a machine running Microsoft Windows NT or
+	    Windows 95/97.
+pc	    A direct-write MS-DOS frame.  Not currently implemented.
 
 PROPS should be a plist of properties, as in the call to `make-frame'.
 
 Value is `tty' for a tty frame (a character-only terminal),
 `x' for a frame that is an X window,
 `ns' for a frame that is a NeXTstep window (not yet implemented),
-`win32' for a frame that is a Windows or Windows NT window (not yet
-  implemented),
+`mswindows' for a frame that is a Windows NT or Windows 95/97 window,
 `pc' for a frame that is a direct-write MS-DOS frame (not yet implemented),
 `stream' for a stream frame (which acts like a stdio stream), and
 `dead' for a deleted frame."

File lisp/language/chinese.el

 (copy-coding-system 'big5 'chinese-big5)
 
 ;; Big5 font requires special encoding.
-;; (define-ccl-program ccl-encode-big5-font
-;;   `(0
-;;     ;; In:  R0:chinese-big5-1 or chinese-big5-2
-;;     ;;      R1:position code 1
-;;     ;;      R2:position code 2
-;;     ;; Out: R1:font code point 1
-;;     ;;      R2:font code point 2
-;;     ((r2 = ((((r1 - ?\x21) * 94) + r2) - ?\x21))
-;;      (if (r0 == ,(charset-id 'chinese-big5-2)) (r2 += 6280))
-;;      (r1 = ((r2 / 157) + ?\xA1))
-;;      (r2 %= 157)
-;;      (if (r2 < ?\x3F) (r2 += ?\x40) (r2 += ?\x62))))
-;;   "CCL program to encode a Big5 code to code point of Big5 font.")
+(define-ccl-program ccl-encode-big5-font
+  `(0
+    ;; In:  R0:chinese-big5-1 or chinese-big5-2
+    ;;      R1:position code 1
+    ;;      R2:position code 2
+    ;; Out: R1:font code point 1
+    ;;      R2:font code point 2
+    ((r2 = ((((r1 - ?\x21) * 94) + r2) - ?\x21))
+     (if (r0 == ,(charset-id 'chinese-big5-2)) (r2 += 6280))
+     (r1 = ((r2 / 157) + ?\xA1))
+     (r2 %= 157)
+     (if (r2 < ?\x3F) (r2 += ?\x40) (r2 += ?\x62))))
+  "CCL program to encode a Big5 code to code point of Big5 font.")
 
 ;; (setq font-ccl-encoder-alist
 ;;       (cons (cons "big5" ccl-encode-big5-font) font-ccl-encoder-alist))
 
-(define-ccl-program ccl-encode-big5-1-font
-  '(((r1 = ((((r0 - #x21) * 94) + r1) - #x21))
-     (r0 = ((r1 / 157) + #xA1))
-     (r1 %= 157)
-     (if (r1 < #x3F) (r1 += #x40) (r1 += #x62))))
-  "CCL program to encode a Big5 code (level1) to code point of Big5 font.")
-
-;; 6280 is the number of characters that got shoved into `chinese-big5-1'.
-(define-ccl-program ccl-encode-big5-2-font
-  '(((r1 = (((((r0 - #x21) * 94) + r1) - #x21) + 6280))
-     (r0 = ((r1 / 157) + #xA1))
-     (r1 %= 157)
-     (if (r1 < #x3F) (r1 += #x40) (r1 += #x62))))
-  "CCL program to encode a Big5 code (level2) to code point of Big5 font.")
-
-(set-charset-ccl-program 'chinese-big5-1 ccl-encode-big5-1-font)
-(set-charset-ccl-program 'chinese-big5-2 ccl-encode-big5-2-font)
+(set-charset-ccl-program 'chinese-big5-1 ccl-encode-big5-font)
+(set-charset-ccl-program 'chinese-big5-2 ccl-encode-big5-font)
 
 (set-language-info-alist
  "Chinese-BIG5" '((setup-function . (setup-chinese-big5-environment

File lisp/language/cyrillic.el

 ;; KOI-8 staff
 
 (define-ccl-program ccl-decode-koi8
-  '(((read r0)
+  '(3
+    ((read r0)
      (loop
-	 (write-read-repeat
-	  r0
-          [0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+       (write-read-repeat
+	r0
+	[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
 	   16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
 	   32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
 	   48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
   "CCL program to decode KOI8.")
 
 (define-ccl-program ccl-encode-koi8
-  '(((read r0)
+  `(1
+    ((read r0)
      (loop
-	 (if (r0 != 140)		; lc-crl == 140
-	     (write-read-repeat r0)
-	   ((read r0)
-	    (r0 -= 160)
-	    (write-read-repeat
-	     r0
-	     [ 32 179  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+       (if (r0 != ,(charset-id 'cyrillic-iso8859-5))
+	   (write-read-repeat r0)
+	 ((read r0)
+	  (r0 -= 160)
+	  (write-read-repeat
+	   r0
+	   [ 32 179  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+		225 226 247 231 228 229 246 250 233 234 235 236 237 238 239 240
+		242 243 244 245 230 232 227 254 251 253 255 249 248 252 224 241
+		193 194 215 199 196 197 214 218 201 202 203 204 205 206 207 208
+		210 211 212 213 198 200 195 222 219 221 223 217 216 220 192 209
+		32 163  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
+	  )))))
+  "CCL program to encode KOI8.")
+
+;(make-coding-system
+;  'cyrillic-koi8 4
+;  ;; We used to use ?K.  It is true that ?K is more strictly correct,
+;  ;; but it is also used for Korean.
+;  ;; So people who use koi8 for languages other than Russian
+;  ;; will have to forgive us.
+;  ?R "KOI8 8-bit encoding for Cyrillic (MIME: KOI8-R)"
+;  (cons ccl-decode-koi8 ccl-encode-koi8))
+
+;(define-coding-system-alias 'koi8-r 'cyrillic-koi8)
+;(define-coding-system-alias 'koi8 'cyrillic-koi8)
+
+;(make-coding-system
+;  'koi8-r 'ccl
+;  "Coding-system used for KOI8-R."
+;  `(decode ,ccl-decode-koi8
+;    encode ,ccl-encode-koi8
+;    mnemonic "KOI8"))
+
+;(define-coding-system-alias 'koi8-r 'koi8)
+
+(define-ccl-program ccl-encode-koi8-font
+  '(0
+    ((r1 -= 160)
+     (r1 = r1
+	 [ 32 179  32  32  32  32  32  32  32  32  32  32  32  32  32  32
 	      225 226 247 231 228 229 246 250 233 234 235 236 237 238 239 240
 	      242 243 244 245 230 232 227 254 251 253 255 249 248 252 224 241
 	      193 194 215 199 196 197 214 218 201 202 203 204 205 206 207 208
 	      210 211 212 213 198 200 195 222 219 221 223 217 216 220 192 209
-	       32 163  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
-	    )))))
-  "CCL program to encode KOI8.")
-	     
-;; (make-coding-system
-;;  'cyrillic-koi8 4
-;;  ;; We used to use ?K.  It is true that ?K is more strictly correct,
-;;  ;; but it is also used for Korean.
-;;  ;; So people who use koi8 for languages other than Russian
-;;  ;; will have to forgive us.
-;;  ?R "KOI8 8-bit encoding for Cyrillic (MIME: KOI8-R)"
-;;  (cons ccl-decode-koi8 ccl-encode-koi8))
-
-;; (define-coding-system-alias 'koi8-r 'cyrillic-koi8)
-;; (define-coding-system-alias 'koi8 'cyrillic-koi8)
-
-;; (make-coding-system
-;;  'koi8-r 'ccl
-;;  "Coding-system used for KOI8-R."
-;;  `(decode ,ccl-decode-koi8
-;;    encode ,ccl-encode-koi8
-;;    mnemonic "KOI8"))
-
-;;(define-coding-system-alias 'koi8-r 'koi8)
-
-(define-ccl-program ccl-encode-koi8-font
-  '(((r1 -= 160)
-     (r1 = r1
-      [ 32 179  32  32  32  32  32  32  32  32  32  32  32  32  32  32
-       225 226 247 231 228 229 246 250 233 234 235 236 237 238 239 240
-       242 243 244 245 230 232 227 254 251 253 255 249 248 252 224 241
-       193 194 215 199 196 197 214 218 201 202 203 204 205 206 207 208
-       210 211 212 213 198 200 195 222 219 221 223 217 216 220 192 209
-        32 163  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
+	      32 163  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
      ))
   "CCL program to encode Cyrillic chars to KOI font.")
 
 ;;; ALTERNATIVNYJ staff
 
 (define-ccl-program ccl-decode-alternativnyj
-  '(((read r0)
+  '(3
+    ((read r0)
      (loop
-	 (write-read-repeat
-	  r0
-          [  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
-	    16  17  18  19  20  21  22  23  24  25  26  27  28  29  30  31
-	    32  33  34  35  36  37  38  39  40  41  42  43  44  45  46  47
-	    48  49  50  51  52  53  54  55  56  57  58  59  60  61  62  63
-	    64  65  66  67  68  69  70  71  72  73  74  75  76  77  78  79
-	    80  81  82  83  84  85  86  87  88  89  90  91  92  93  94  95
-	    96  97  98  99 100 101 102 103 104 105 106 107 108 109 110 111
-	   112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
-	    ?,L0(B  ?,L1(B  ?,L2(B  ?,L3(B  ?,L4(B  ?,L5(B  ?,L6(B  ?,L7(B  ?,L8(B  ?,L9(B  ?,L:(B  ?,L;(B  ?,L<(B  ?,L=(B  ?,L>(B  ?,L?(B
-	    ?,L@(B  ?,LA(B  ?,LB(B  ?,LC(B  ?,LD(B  ?,LE(B  ?,LF(B  ?,LG(B  ?,LH(B  ?,LI(B  ?,LJ(B  ?,LK(B  ?,LL(B  ?,LM(B  ?,LN(B  ?,LO(B
-	    ?,LP(B  ?,LQ(B  ?,LR(B  ?,LS(B  ?,LT(B  ?,LU(B  ?,LV(B  ?,LW(B  ?,LX(B  ?,LY(B  ?,LZ(B  ?,L[(B  ?,L\(B  ?,L](B  ?,L^(B  ?,L_(B
-	    32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
-	    32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
-	    32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
-	    ?,L`(B  ?,La(B  ?,Lb(B  ?,Lc(B  ?,Ld(B  ?,Le(B  ?,Lf(B  ?,Lg(B  ?,Lh(B  ?,Li(B  ?,Lj(B  ?,Lk(B  ?,Ll(B  ?,Lm(B  ?,Ln(B  ?,Lo(B
-	    ?,L!(B  ?,Lq(B   32  32  32  32  32  32  32  32  32  32  32  32  32 ?,Lp(B]))))
+       (write-read-repeat
+	r0
+	[  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+	       16  17  18  19  20  21  22  23  24  25  26  27  28  29  30  31
+	       32  33  34  35  36  37  38  39  40  41  42  43  44  45  46  47
+	       48  49  50  51  52  53  54  55  56  57  58  59  60  61  62  63
+	       64  65  66  67  68  69  70  71  72  73  74  75  76  77  78  79
+	       80  81  82  83  84  85  86  87  88  89  90  91  92  93  94  95
+	       96  97  98  99 100 101 102 103 104 105 106 107 108 109 110 111
+	       112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
+	       ?,L0(B  ?,L1(B  ?,L2(B  ?,L3(B  ?,L4(B  ?,L5(B  ?,L6(B  ?,L7(B  ?,L8(B  ?,L9(B  ?,L:(B  ?,L;(B  ?,L<(B  ?,L=(B  ?,L>(B  ?,L?(B
+	       ?,L@(B  ?,LA(B  ?,LB(B  ?,LC(B  ?,LD(B  ?,LE(B  ?,LF(B  ?,LG(B  ?,LH(B  ?,LI(B  ?,LJ(B  ?,LK(B  ?,LL(B  ?,LM(B  ?,LN(B  ?,LO(B
+	       ?,LP(B  ?,LQ(B  ?,LR(B  ?,LS(B  ?,LT(B  ?,LU(B  ?,LV(B  ?,LW(B  ?,LX(B  ?,LY(B  ?,LZ(B  ?,L[(B  ?,L\(B  ?,L](B  ?,L^(B  ?,L_(B
+	       32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	       32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	       32  32  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+	       ?,L`(B  ?,La(B  ?,Lb(B  ?,Lc(B  ?,Ld(B  ?,Le(B  ?,Lf(B  ?,Lg(B  ?,Lh(B  ?,Li(B  ?,Lj(B  ?,Lk(B  ?,Ll(B  ?,Lm(B  ?,Ln(B  ?,Lo(B
+	       ?,L!(B  ?,Lq(B   32  32  32  32  32  32  32  32  32  32  32  32  32 ?,Lp(B]))))
   "CCL program to decode Alternativnyj.")
 
 (define-ccl-program ccl-encode-alternativnyj
-  '(((read r0)
+  `(1
+    ((read r0)
      (loop
-	 (if (r0 != 140)		; lc-crl == 140
-	     (write-read-repeat r0)
-	   ((read r0)
-	    (r0 -= 160)
-	    (write-read-repeat
-	     r0
-	     [ 32 240  32  32  32  32  32  32  32  32  32  32  32  32  32  32
-	      128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
-	      144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
-	      160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175
-	      224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239
-	      255 241  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
-	    )))))
+       (if (r0 != ,(charset-id 'cyrillic-iso8859-5))
+	   (write-read-repeat r0)
+	 ((read r0)
+	  (r0 -= 160)
+	  (write-read-repeat
+	   r0
+	   [ 32 240  32  32  32  32  32  32  32  32  32  32  32  32  32  32
+		128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
+		144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
+		160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175
+		224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239
+		255 241  32  32  32  32  32  32  32  32  32  32  32  32  32  32])
+	  )))))
   "CCL program to encode Alternativnyj.")
 
 ;; (make-coding-system
    mnemonic "Cy.Alt"))
 
 (define-ccl-program ccl-encode-alternativnyj-font
-  '(((r1 -= 160)
+  '(0
+    ((r1 -= 160)
      (r1 = r1
       [ 32 240  32  32  32  32  32  32  32  32  32  32  32  32  32  32
        128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
 
 ;;; GENERAL
 
-;; (defun setup-cyrillic-environment ()
-;;   "Setup multilingual environment for Cyrillic users."
-;;   (interactive)
-;;   (setq primary-language "Cyrillic")
-;; 
-;;   (setq coding-category-iso-8-1 'iso-8859-5)
-;; 
-;;   (set-coding-priority
-;;    '(coding-category-iso-7
-;;      coding-category-iso-8-1))
-;; 
-;;   (setq-default buffer-file-coding-system 'iso-8859-5)
-;;   (set-terminal-coding-system 'iso-8859-5)
-;;   (set-keyboard-coding-system 'iso-8859-5)
-;; 
-;;   (setq default-input-method '("Cyrillic" . "quail-yawerty"))
-;;   )
+(defun setup-cyrillic-environment ()
+  "Setup multilingual environment for Cyrillic users."
+  (interactive)
+  (setq primary-language "Cyrillic")
 
-;; (defun describe-cyrillic-support ()
-;;   "Describe how Emacs support Cyrillic."
-;;   (interactive)
-;;   (describe-language-support-internal "Cyrillic"))
+  (setq coding-category-iso-8-1 'iso-8859-5)
 
-;; (set-language-info-alist
-;;  "Cyrillic" '((setup-function . setup-cyrillic-environment)
-;;               (describe-function . describe-cyrillic-support)
-;;               (charset . (cyrillic-iso8859-5))
-;;               (coding-system . (iso-8859-5 koi8-r alternativnyj))
-;;               (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!")
-;;               (documentation . nil)))
+  (set-coding-priority
+   '(coding-category-iso-7
+     coding-category-iso-8-1))
+
+  (setq-default buffer-file-coding-system 'iso-8859-5)
+  (set-terminal-coding-system 'iso-8859-5)
+  (set-keyboard-coding-system 'iso-8859-5)
+
+  (setq default-input-method '("Cyrillic" . "quail-yawerty"))
+  )
+
+(defun describe-cyrillic-support ()
+  "Describe how Emacs support Cyrillic."
+  (interactive)
+  (describe-language-support-internal "Cyrillic"))
+
+(set-language-info-alist
+ "Cyrillic" '((setup-function . setup-cyrillic-environment)
+              (describe-function . describe-cyrillic-support)
+              (charset . (cyrillic-iso8859-5))
+              (coding-system . (iso-8859-5 koi8-r alternativnyj))
+              (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!")
+              (documentation . nil)))
 
 ;;; cyrillic.el ends here

File lisp/language/vietnamese.el

 )
 
 (define-ccl-program ccl-read-viscii
-  `(((read r0)
+  `(3
+    ((read r0)
      (loop
        (write-read-repeat r0 ,viet-viscii-decode-table))
      ))
 ;; `vietnamese-viscii-lower' or `vietnamese-viscii-upper'.
 
 (define-ccl-program ccl-write-viscii
-  `(((read r0)
+  `(1
+    ((read r0)
      (loop
        (if (r0 < 128)
+	   ;; ASCII
 	   (write-read-repeat r0)
-	 (if (r0 != 154)
+	 ;; not ASCII
+	 (if (r0 != ,leading-code-private-11)
+	     ;; not Vietnamese
 	     (write-read-repeat r0)
-	   ((read-if (r0 == 163)
-	     ((read r0)
-	      (r0 -= 160)
+	   ((read-if (r0 == ,(charset-id 'vietnamese-viscii-lower))
+	     (;; Vietnamese lower
+	      (read r0)
+	      (r0 -= 128)
 	      (write-read-repeat r0 ,(car viet-viscii-encode-table))
-	      (if (r0 == 164)
-		  ((read r0)
-		   (r0 -= 160)
+	      (if (r0 == ,(charset-id 'vietnamese-viscii-upper))
+		  (;; Vietnamese upper
+		   (read r0)
+		   (r0 -= 128)
 		   (write-read-repeat r0 ,(cdr viet-viscii-encode-table)))
+	        ;; not Vietnamese
 		(write-read-repeat r0))))))))))
   "CCL program to write VISCII 1.1")
 
-;; (define-ccl-program ccl-encode-viscii
-;;   `(1
-;;      ((read r0)
-;;       (loop
-;;        (if (r0 < 128)
-;;            ;; ASCII
-;;            (write-read-repeat r0)
-;;          ;; not ASCII
-;;          (if (r0 != ,leading-code-private-11)
-;;              ;; not Vietnamese
-;;              (write-read-repeat r0)
-;;            ((read-if (r0 == ,(charset-id 'vietnamese-viscii-lower))
-;;              (;; Vietnamese lower
-;;               (read r0)
-;;               (r0 -