Mercurial > hg > xemacs-beta

changeset 304:c6de09ad3017 r21-0b50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b50
author cvs
date Mon, 13 Aug 2007 10:41:12 +0200
parents d02ffe1d75ed
children 18920a7e9a86
files CHANGES-beta ChangeLog Makefile.in PROBLEMS config.guess etc/NEWS etc/photos/jmiller.xpm.Z etc/photos/jmillerm.xpm.Z lib-src/ChangeLog lib-src/update-elc.sh lisp/ChangeLog lisp/about.el lisp/dumped-lisp.el lisp/keymap.el lisp/ldap.el lisp/loadup.el lisp/make-docfile.el lisp/menubar-items.el lisp/msw-mouse.el lisp/package-get-base.el lisp/packages.el lisp/update-elc.el lisp/very-early-lisp.el man/ChangeLog nt/ChangeLog nt/xemacs.mak src/ChangeLog src/eldap.c src/general.c src/glyphs-msw.c src/glyphs-x.c src/nt.c src/unexnt.c version.sh
diffstat 34 files changed, 798 insertions(+), 329 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Mon Aug 13 10:40:50 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:41:12 2007 +0200
@@ -1,6 +1,12 @@
 							-*- indented-text -*-
+to 21.0 pre6 "Belgian Fawn"
+-- Miscellaneous bug fixes from various people
+-- Rename MS Windows 'resource image instantiator to 'mswindows-resource
+   courtesy of Altrasoft and Ben Wing
+
 to 21.0 pre5 "Zhong Wei"
 -- multiple DB configure fix from Gregory Neil Shapiro
+-- miscellaneous fixes from various people
 
 to 21.0 pre4 "Uzbek Black"
 -- Miscellaneous documentation cleanup from Altrasoft
--- a/ChangeLog	Mon Aug 13 10:40:50 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:41:12 2007 +0200
@@ -1,3 +1,19 @@
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre7 is released.
+
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre6 is released.
+
+1998-07-18  SL Baur  <steve@altair.xemacs.org>
+
+	* config.guess: Synched with latest FSF version.
+
+1998-07-12  Björn Torkelsson  <torkel@hpc2n.umu.se>
+
+	* Makefile.in: added LDFLAGS. 
+
 1998-07-12  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre5 is released.
--- a/Makefile.in	Mon Aug 13 10:40:50 2007 +0200
+++ b/Makefile.in	Mon Aug 13 10:41:12 2007 +0200
@@ -63,6 +63,7 @@
 LN_S=@LN_S@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
+LDFLAGS=@LDFLAGS@
 
 ## These help us choose version- and architecture-specific directories
 ## to install files in.
--- a/PROBLEMS	Mon Aug 13 10:40:50 2007 +0200
+++ b/PROBLEMS	Mon Aug 13 10:41:12 2007 +0200
@@ -183,14 +183,15 @@
 
 ** I don't have `xmkmf' and `imake' on my HP.
 
-You can get these standard X tools by anonymous FTP to hpcvaaz.cv.hp.com.
-Essentially all X programs need these.
+  You can get these standard X tools by anonymous FTP to
+  hpcvaaz.cv.hp.com.  Essentially all X programs need these.
 
 ** On HP-UX, problems with make
 
 Marcus Thiessel <marcus_thiessel@hp.com>
 
-  Some releases of XEmacs require GNU make to build successfully.
+  Some releases of XEmacs (e.g. 20.4) require GNU make to build
+  successfully. You don't need GNU make when building 21.x.
 
 ** On HP-UX 9.05 XEmacs won't compile or coredump during the build.
 
@@ -199,6 +200,24 @@
   This might be a sed problem. For your own safety make sure to use
   GNU sed while dumping XEmacs.
 
+** On HP-UX 11.0 XEmacs causes excessive X11 errors when running.
+
+Marcus Thiessel <marcus_thiessel@hp.com>
+
+  Unfortunately, XEmacs releases don't work with Motif2.1. It
+  will compile but you will get excessive X11 errors like
+
+  xemacs: X Error of failed request:  BadGC (invalid GC parameter)
+
+  and finally XEmacs gets killed. A workaround is to use the
+  Motif1.2_R6 libraries. You can the following line to your call to
+  configure:
+
+     --x-libraries="/usr/lib/Motif1.2_R6 -L/usr/lib/X11R6"
+ 
+  Make sure /usr/lib/Motif1.2_R6/libXm.sl is a link to
+  /usr/lib/Motif1.2_R6/libXm.3.
+
 ** Solaris 2.3 /bin/sh coredumps during configuration.
 
 This only occurs if you have LANG != C.  This is a known bug with
--- a/config.guess	Mon Aug 13 10:40:50 2007 +0200
+++ b/config.guess	Mon Aug 13 10:41:12 2007 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -52,11 +52,53 @@
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
+	cat <<EOF >dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} dummy.s -o dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
 	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
@@ -68,11 +110,35 @@
       echo m68k-cbm-netbsd${UNAME_RELEASE}
       exit 0 ;;
     amiga:OpenBSD:*:*)
-      echo m68k-cbm-openbsd${UNAME_RELEASE}
-      exit 0 ;;
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
+    SR2?01:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
     Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -84,6 +150,9 @@
     NILE:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -108,6 +177,18 @@
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
@@ -115,19 +196,25 @@
 	echo m68k-atari-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     atari*:OpenBSD:*:*)
-	echo m68k-atari-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3*:NetBSD:*:*)
 	echo m68k-sun-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3*:OpenBSD:*:*)
-	echo m68k-sun-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     mac68k:NetBSD:*:*)
 	echo m68k-apple-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     mac68k:OpenBSD:*:*)
-	echo m68k-apple-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
@@ -141,6 +228,9 @@
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >dummy.c
 	int main (argc, argv) int argc; char **argv; {
@@ -375,8 +465,8 @@
     hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
-    hp3[0-9][05]:OpenBSD:*:*)
-	echo m68k-hp-openbsd${UNAME_RELEASE}
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     i?86:BSD/386:*:* | *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -391,7 +481,10 @@
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
     i*:CYGWIN*:*)
-	echo i386-pc-cygwin32
+	echo ${UNAME_MACHINE}-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin32
@@ -400,43 +493,134 @@
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
     *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+	esac
+
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us.
 	ld_help_string=`ld --help 2>&1`
-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
-	  echo "powerpc-unknown-linux-gnu" ; exit 0
-	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  echo alpha-unknown-linux-gnu ; exit 0
-	elif test "${UNAME_MACHINE}" = "sparc" ; then
-	  echo sparc-unknown-linux-gnu ; exit 0
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f dummy.s dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+	elif test "${UNAME_MACHINE}" = "mips" ; then
+	  cat >dummy.c <<EOF
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
+#ifdef __MIPSEB__
+  printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+  return 0;
+}
+EOF
+	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+	  rm -f dummy.c dummy
 	else
-	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
 	  # Determine whether the default compiler is a.out or elf
 	  cat >dummy.c <<EOF
+#include <features.h>
 main(argc, argv)
-int argc;
-char *argv[];
+     int argc;
+     char *argv[];
 {
 #ifdef __ELF__
-  printf ("%s-pc-linux-gnu\n", argv[1]);
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
 #else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
 #endif
   return 0;
 }
@@ -449,6 +633,14 @@
     i?86:DYNIX/ptx:4*:*)
 	echo i386-sequent-sysv4
 	exit 0 ;;
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
@@ -470,6 +662,11 @@
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit 0 ;;
@@ -529,6 +726,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit 0 ;;
+    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                           # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -541,6 +742,9 @@
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
     R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
@@ -548,10 +752,6 @@
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
         exit 0 ;;
-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
--- a/etc/NEWS	Mon Aug 13 10:40:50 2007 +0200
+++ b/etc/NEWS	Mon Aug 13 10:41:12 2007 +0200
@@ -299,6 +299,13 @@
 This behaviour can be customized, look for `Info-auto-generate-directory'
 and `Info-save-auto-generated-dir' in the `info' customization group.
 
+** Version Control is no longer automatically loaded.  Users must
+add:
+
+(require 'vc-hooks)
+
+to their .emacs file to get version control functionality.
+
 
 * Lisp and internal changes in XEmacs 21.0
 ==========================================
@@ -493,7 +500,7 @@
 Look under "Startup Paths" in the Info documentation for more
 information.
 
-*** site-lisp is now longer part of the load-path by default.
+*** site-lisp is no longer part of the load-path by default.
 Its use is deprecated, but you can specify --with-site-lisp=yes at the
 configure command line to get it back.
 
Binary file etc/photos/jmiller.xpm.Z has changed
Binary file etc/photos/jmillerm.xpm.Z has changed
--- a/lib-src/ChangeLog	Mon Aug 13 10:40:50 2007 +0200
+++ b/lib-src/ChangeLog	Mon Aug 13 10:41:12 2007 +0200
@@ -1,3 +1,16 @@
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre7 is released.
+
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre6 is released.
+
+1998-07-15  SL Baur  <steve@altair.xemacs.org>
+
+	* update-elc.sh (ignore_pattern): Add very-early-lisp.el as
+	something to never bytecompile.
+
 1998-07-12  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre5 is released.
--- a/lib-src/update-elc.sh	Mon Aug 13 10:40:50 2007 +0200
+++ b/lib-src/update-elc.sh	Mon Aug 13 10:41:12 2007 +0200
@@ -167,6 +167,7 @@
 \!/site-load.el$!d
 \!/site-init.el$!d
 \!/version.el$!d
+\!/very-early-lisp.el$!d
 \!/Installation.el$!d
 '
 
--- a/lisp/ChangeLog	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:41:12 2007 +0200
@@ -1,5 +1,50 @@
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre7 is released.
+
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre6 is released.
+
+1998-07-12  Oscar Figueiredo  <Oscar.Figueiredo@di.epfl.ch>
+
+	* ldap.el (ldap-search): Doc string change
+
+1998-07-16  Colin Rafferty   <colin@xemacs.org>
+
+	* menubar-items.el (default-menubar): Removed references to
+	`data-directory', and use `locate-data-file' instead, and made 
+	then greyed out if they don't exist.
+
+1998-07-14  Oscar Figueiredo  <Oscar.Figueiredo@di.epfl.ch>
+
+	* keymap.el (events-to-keys): Use `format' instead of `concat'
+	since the latter does not accept integer args anymore
+
 1998-07-12  SL Baur  <steve@altair.xemacs.org>
 
+	* msw-mouse.el: Global change resource -> mswindows-resource.
+
+1998-07-15  SL Baur  <steve@altair.xemacs.org>
+
+	* dumped-lisp.el (preloaded-file-list): Usage of Lisp read-time
+	macros replaced.
+
+1998-07-14  SL Baur  <steve@altair.xemacs.org>
+
+	* make-docfile.el: Get first initialization from very-early-lisp.el
+	* update-elc.el: Ditto.
+	* loadup.el (really-early-error-handler): Ditto.
+
+	* packages.el (packages-unbytecompiled-lisp): Add new file,
+	very-early-lisp.el.
+
+	* very-early-lisp.el: New file.
+
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* about.el: Fix typos, update release date.
+
 	* XEmacs 21.0-pre5 is released.
 
 1998-07-11  SL Baur  <steve@altair.xemacs.org>
--- a/lisp/about.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/about.el	Mon Aug 13 10:41:12 2007 +0200
@@ -209,7 +209,7 @@
     (let* ((emacs-short-version (format "%d.%d"
 					emacs-major-version
 					emacs-minor-version))
-	   (emacs-about-version (format "version %s; Apr 1998"
+	   (emacs-about-version (format "version %s; Aug 1998"
 					emacs-short-version)))
       (widget-insert (about-center emacs-about-version))
       (widget-create 'link :help-echo "The latest NEWS of XEmacs"
@@ -988,7 +988,7 @@
       (about-url-link 'jason "Visit Jason's homepage")
       (widget-insert ".\n"))
     (jmiller
-     (widget-inset "\
+     (widget-insert "\
 Jeff grew up in Indiana and is a country boy at heart.  He currently lives
 in, of all places, Millersville Maryland.  He spends a lot of his free
 time tinkering with Linux and hacking on XEmacs and loves it when he finds
@@ -1257,8 +1257,8 @@
 extensions.\n")
        (print-short "Darryl Okahata" "darrylo@sr.hp.com" "\
 Perennial Emacs hacker since 1986 or so, when he first started on GNU
-Emacs 17.something.  Over the years, he's developed "OEmacs", the first
-version of GNU Emacs 19 for MSDOS, and "bigperl", a 32-bit version of
+Emacs 17.something.  Over the years, he's developed \"OEmacs\", the first
+version of GNU Emacs 19 for MSDOS, and \"bigperl\", a 32-bit version of
 Perl4 for MSDOS.  In recent years, reality has intruded and he no longer 
 has much time for playing with cool programs.  What little time he has
 now goes to XEmacs hacking, where he's worked on speeding up dired under 
@@ -1419,7 +1419,6 @@
        (print-short "David M. Meyer" "meyer@ns.uoregon.edu")
        (print-short "John Mignault" "jbm@panix.com")
        (print-short "Brad Miller" "bmiller@cs.umn.edu")
-       (print-short "Jeff Miller" "jmiller@smart.net")
        (print-short "John Morey" "jmorey@crl.com")
        (print-short "Rob Mori" "rob.mori@sun.com")
        (print-short "Heiko Muenkel" "muenkel@tnt.uni-hannover.de")
--- a/lisp/dumped-lisp.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/dumped-lisp.el	Mon Aug 13 10:41:12 2007 +0200
@@ -1,5 +1,6 @@
 (setq preloaded-file-list
-      '("backquote" 		; needed for defsubst etc.
+      (assemble-list
+        "backquote" 		; needed for defsubst etc.
 	"bytecomp-runtime"	; define defsubst
 	"Installation.el"
 	"find-paths"
@@ -32,7 +33,7 @@
 	"events"
 	"text-props"
 	"process" ;; This is bad. network-streams may not be defined.
-	#+multicast "multicast" ;; #+network-streams implicitely true
+	(when-feature multicast "multicast") ; #+network-streams implicitely true
 	"frame"			; move up here cause some stuff needs it here
 	"map-ynp"
 	"simple"
@@ -53,10 +54,10 @@
 				;  `emacs-user-extension-dir'
 	"misc"
 	;; (pureload "profile")
-	#-mule "help-nomule"
+	(unless-feature mule "help-nomule")
 	"help"
 	;; (pureload "hyper-apropos")  Soon...
-	#-file-coding "files-nomule"
+	(unless-feature file-coding "files-nomule")
 	"files"
 	"lib-complete"
 	"format"
@@ -80,32 +81,32 @@
 	"fill"
 	"auto-save"		; Added for 20.4
 
-	#+windows-nt "winnt"
-	#+lisp-float-type "float-sup"
+	(when-feature windows-nt "winnt")
+	(when-feature lisp-float-type "float-sup")
 	"itimer"		; for vars auto-save-timeout and
 				; auto-gc-threshold
 	"itimer-autosave"
-	#+toolbar "toolbar"
-	#+scrollbar "scrollbar"
-	#+menubar "menubar"
-	#+dialog "dialog"
-	#+mule "mule-charset"
-	#+file-coding "coding"
-	#+mule "mule-coding"
+	(when-feature toolbar "toolbar")
+	(when-feature scrollbar "scrollbar")
+	(when-feature menubar "menubar")
+	(when-feature dialog "dialog")
+	(when-feature mule "mule-charset")
+	(when-feature file-coding "coding")
+	(when-feature mule "mule-coding")
 ;; Handle I/O of files with extended characters.
-	#+file-coding "code-files"
-	#+mule "mule-files"
+	(when-feature file-coding "code-files")
+	(when-feature mule "mule-files")
 ;; Handle process with encoding/decoding non-ascii coding-system.
-	#+file-coding "code-process"
-	#+mule "mule-help"
+	(when-feature file-coding "code-process")
+	(when-feature mule "mule-help")
 ;; Load the remaining basic files.
-	#+mule "mule-category"
-	#+mule "mule-ccl"
-	#+mule "mule-misc"
-	#+mule "kinsoku"
-	#+(and mule x) "mule-x-init"
-	#+(and mule tty) "mule-tty-init"
-	#+mule "mule-cmds" ; to sync with Emacs 20.1
+	(when-feature mule "mule-category")
+	(when-feature mule "mule-ccl")
+	(when-feature mule "mule-misc")
+	(when-feature mule "kinsoku")
+	(when-feature (and mule x) "mule-x-init")
+	(when-feature (and mule tty) "mule-tty-init")
+	(when-feature mule "mule-cmds") ; to sync with Emacs 20.1
 
 ;; after this goes the specific lisp routines for a particular input system
 ;; 97.2.5 JHod Shouldn't these go into a site-load file to allow site
@@ -123,95 +124,97 @@
 ;; Now load files to set up all the different languages/environments
 ;; that Mule knows about.
 
-	#+mule "arabic"
-	#+mule "chinese"
-	#+mule "mule-base/cyrillic" ; overloaded in leim/quail
-	#+mule "english"
-;;	#+mule "ethiopic"
-	#+mule "european"
-	#+mule "mule-base/greek" ; overloaded in leim/quail
-	#+mule "hebrew"
-	#+mule "japanese"
-	#+mule "korean"
-	#+mule "misc-lang"
-;;	#+mule "thai"
-	#+mule "viet-chars"
-;;	#+mule "vietnamese"
+	(when-feature mule "arabic")
+	(when-feature mule "chinese")
+	(when-feature mule "mule-base/cyrillic") ; overloaded in leim/quail
+	(when-feature mule "english")
+;;	(when-feature mule "ethiopic")
+	(when-feature mule "european")
+	(when-feature mule "mule-base/greek") ; overloaded in leim/quail
+	(when-feature mule "hebrew")
+	(when-feature mule "japanese")
+	(when-feature mule "korean")
+	(when-feature mule "misc-lang")
+;;	(when-feature mule "thai")
+	(when-feature mule "viet-chars")
+;;	(when-feature mule "vietnamese")
 
 	;; Specialized language support
-	#+(and mule CANNA) "canna-leim"
+	(when-feature (and mule CANNA) "canna-leim")
 ;; Egg/Its is now a package
-;	#+(and mule wnn) "egg-leim"
-;	#+(and mule wnn) "egg-kwnn-leim"
-;	#+(and mule wnn) "egg-cwnn-leim"
-;	#+mule "egg-sj3-leim"
+;	(when-feature (and mule wnn) "egg-leim")
+;	(when-feature (and mule wnn) "egg-kwnn-leim")
+;	(when-feature (and mule wnn) "egg-cwnn-leim")
+;	(when-feature mule "egg-sj3-leim")
 ;; SKK is now a package
-;	#+mule "skk-leim"
+;	(when-feature mule "skk-leim")
 
 ;; Set up the XEmacs environment for Mule.
 ;; Assumes the existence of various stuff above.
-	#+mule "mule-init"
+	(when-feature mule "mule-init")
 
 ;; Enable Mule capability for Gnus, mail, etc...
 ;; Moved to sunpro-load.el - the default only for Sun.
 ;;(pureload "mime-setup")
 ;;; mule-load.el ends here
-	#+window-system "gui"
-	#+window-system "mode-motion"
-	#+window-system "mouse"
-	#+window-system "select"
-	#+dragdrop-api "dragdrop"
+	(when-feature window-system "gui")
+	(when-feature window-system "mode-motion")
+	(when-feature window-system "mouse")
+	(when-feature window-system "select")
+	(when-feature dragdrop-api "dragdrop")
 ;; preload the X code, for faster startup.
-	#+(and (not infodock) (or x mswindows) menubar) "menubar-items"
-	#+(and infodock (or x mswindows) menubar) "id-menus"
-	#+x "x-faces"
-	#+x "x-iso8859-1"
-	#+x "x-mouse"
-	#+x "x-select"
-	#+(and x scrollbar) "x-scrollbar"
-	#+x "x-misc"
-	#+x "x-init"
-	#+(and (not infodock) window-system toolbar) "toolbar-items"
-	#+x "x-win-xfree86"
-	#+x "x-win-sun"
+	(when-feature (and (not infodock)
+			   (or x mswindows) menubar) "menubar-items")
+	(when-feature (and infodock (or x mswindows) menubar) "id-menus")
+	(when-feature x "x-faces")
+	(when-feature x "x-iso8859-1")
+	(when-feature x "x-mouse")
+	(when-feature x "x-select")
+	(when-feature (and x scrollbar) "x-scrollbar")
+	(when-feature x "x-misc")
+	(when-feature x "x-init")
+	(when-feature (and (not infodock)
+			   window-system toolbar) "toolbar-items")
+	(when-feature x "x-win-xfree86")
+	(when-feature x "x-win-sun")
 ;; preload the mswindows code.
-	#+mswindows "msw-glyphs"
-	#+mswindows "msw-faces"
-	#+mswindows "msw-mouse"
-	#+mswindows "msw-init"
-	#+mswindows "msw-select"
+	(when-feature mswindows "msw-glyphs")
+	(when-feature mswindows "msw-faces")
+	(when-feature mswindows "msw-mouse")
+	(when-feature mswindows "msw-init")
+	(when-feature mswindows "msw-select")
 ;; preload the TTY init code.
-	#+tty "tty-init"
+	(when-feature tty "tty-init")
 ;;; Formerly in tooltalk/tooltalk-load.el
 	;; Moved to tooltalk package
-	;; #+tooltalk "tooltalk-macros"
-	;; #+tooltalk "tooltalk-util"
-	;; #+tooltalk "tooltalk-init"
+	;; (when-feature tooltalk "tooltalk-macros")
+	;; (when-feature tooltalk "tooltalk-util")
+	;; (when-feature tooltalk "tooltalk-init")
 	;; "vc-hooks"		; Packaged.  Available in two versions.
 	;; "ediff-hook"		; Packaged.
 	"fontl-hooks"
 	"auto-show"
-	#+ldap "ldap"
+	(when-feature ldap "ldap")
 
-;; #+energize "energize/energize-load.el"
+;; (when-feature energize "energize/energize-load.el")
 ;;; formerly in sunpro/sunpro-load.el
-;;	#+(and mule sparcworks) "mime-setup"
+;;	(when-feature (and mule sparcworks) "mime-setup")
 
 	;; Moved to Sun package
-	;; #+sparcworks "cc-mode" ; Requires cc-mode package
-	;; #+sparcworks "sunpro-init"
-	;; #+sparcworks "ring"
-	;; #+sparcworks "comint" ; Requires comint package
-	;; #+sparcworks "annotations"
+	;; (when-feature sparcworks "cc-mode") ; Requires cc-mode package
+	;; (when-feature sparcworks "sunpro-init")
+	;; (when-feature sparcworks "ring")
+	;; (when-feature sparcworks "comint") ; Requires comint package
+	;; (when-feature sparcworks "annotations")
 
 ;;; formerly in eos/sun-eos-load.el
-;;	#+sparcworks "sun-eos-init"
-;;	#+sparcworks "sun-eos-common"
-;;	#+sparcworks "sun-eos-editor"
-;;	#+sparcworks "sun-eos-browser"
-;;	#+sparcworks "sun-eos-debugger"
-;;	#+sparcworks "sun-eos-debugger-extra"
-;;	#+sparcworks "sun-eos-menubar"
+;;	(when-feature sparcworks "sun-eos-init")
+;;	(when-feature sparcworks "sun-eos-common")
+;;	(when-feature sparcworks "sun-eos-editor")
+;;	(when-feature sparcworks "sun-eos-browser")
+;;	(when-feature sparcworks "sun-eos-debugger")
+;;	(when-feature sparcworks "sun-eos-debugger-extra")
+;;	(when-feature sparcworks "sun-eos-menubar")
 	"loadhist"		; Must be dumped before loaddefs is loaded
 	"loaddefs"		; <=== autoloads get loaded here
 ))
--- a/lisp/keymap.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/keymap.el	Mon Aug 13 10:41:12 2007 +0200
@@ -354,7 +354,7 @@
                        (error
                          "Mouse events can't be saved in keyboard macros."))
                    (setq mods (event-modifiers event)
-                         key (intern (concat "button"
+                         key (intern (format "button%d%s"
                                              (event-button event)
                                              (if (button-release-event-p event)
                                                  "up" ""))))
--- a/lisp/ldap.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/ldap.el	Mon Aug 13 10:41:12 2007 +0200
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Created: Jan 1998
-;; Version: $Revision: 1.7 $
+;; Version: $Revision: 1.8 $
 ;; Keywords: help comm
 
 ;; This file is part of XEmacs
@@ -62,8 +62,8 @@
   "Perform an LDAP search.
 FILTER is the search filter in RFC1558 syntax
 HOST is the LDAP host on which to perform the search
-ATTRIBUTES is the specific attributes to retrieve, nil means 
-retrieve all
+ATTRIBUTES is a list of the specific attributes to retrieve, 
+nil means retrieve all
 ATTRSONLY if non nil retrieves the attributes only without 
 the associated values.
 Additional search parameters can be specified through 
--- a/lisp/loadup.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/loadup.el	Mon Aug 13 10:41:12 2007 +0200
@@ -37,7 +37,6 @@
 (if (fboundp 'error)
     (error "loadup.el already loaded!"))
 
-(define-function 'defalias 'define-function)
 (defvar running-xemacs t
   "Non-nil when the current emacs is XEmacs.")
 (defvar preloaded-file-list nil
@@ -54,6 +53,9 @@
 	;; We don't want to have any undo records in the dumped XEmacs.
 	(buffer-disable-undo (get-buffer "*scratch*"))
 
+	;; Load our first bootstrap support
+	(load "very-early-lisp" nil t)
+
 	;; lread.c (or src/Makefile.in.in) has prepended
 	;; "${srcdir}/../lisp/" to load-path, which is how this file
 	;; has been found.  At this point, enough of XEmacs has been
--- a/lisp/make-docfile.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/make-docfile.el	Mon Aug 13 10:41:12 2007 +0200
@@ -75,9 +75,9 @@
   (setq command-line-args (cdr command-line-args)))
 
 ;; Then process the list of Lisp files.
-(define-function 'defalias 'define-function)
+(setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
 
-(setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
+(load "very-early-lisp" nil t)
 
 ;; Then process the autoloads
 (setq autoload-file-name "auto-autoloads.elc")
--- a/lisp/menubar-items.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/menubar-items.el	Mon Aug 13 10:41:12 2007 +0200
@@ -898,12 +898,9 @@
        ["FAQ via WWW" xemacs-www-faq	(boundp 'browse-url-browser-function)]
        ["Home Page" xemacs-www-page		(boundp 'browse-url-browser-function)])
       ("Samples"
-       ["Sample .emacs" (find-file (expand-file-name "sample.emacs"
-						     data-directory))]
-       ["Sample .Xdefaults" (find-file (expand-file-name "sample.Xdefaults"
-							 data-directory))]
-       ["Sample enriched" (find-file (expand-file-name "enriched.doc"
-						       data-directory))])
+       ["Sample .emacs" (find-file (locate-data-file "sample.emacs")) (locate-data-file "sample.emacs")]
+       ["Sample .Xdefaults" (find-file (locate-data-file "sample.Xdefaults")) (locate-data-file "sample.Xdefaults")]
+       ["Sample enriched" (find-file (locate-data-file "enriched.doc")) (locate-data-file "enriched.doc")])
       "-----"
       ("Lookup in Info"
        ["Key Binding..." Info-goto-emacs-key-command-node]
--- a/lisp/msw-mouse.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/msw-mouse.el	Mon Aug 13 10:41:12 2007 +0200
@@ -31,18 +31,18 @@
 ;;; Code:
 
 (set-glyph-image text-pointer-glyph
-		 [resource :resource-type cursor :resource-id "Ibeam"])
+		 [mswindows-resource :resource-type cursor :resource-id "Ibeam"])
 (set-glyph-image nontext-pointer-glyph
-		 [resource :resource-type cursor :resource-id "Normal"])
+		 [mswindows-resource :resource-type cursor :resource-id "Normal"])
 (set-glyph-image selection-pointer-glyph
-		 [resource :resource-type cursor :resource-id "Normal"])
+		 [mswindows-resource :resource-type cursor :resource-id "Normal"])
 (set-glyph-image modeline-pointer-glyph
-		 [resource :resource-type cursor :resource-id "SizeNS"])
+		 [mswindows-resource :resource-type cursor :resource-id "SizeNS"])
 (set-glyph-image divider-pointer-glyph
-		 [resource :resource-type cursor :resource-id "SizeWE"])
+		 [mswindows-resource :resource-type cursor :resource-id "SizeWE"])
 (set-glyph-image busy-pointer-glyph
-		 [resource :resource-type cursor :resource-id "Wait"])
+		 [mswindows-resource :resource-type cursor :resource-id "Wait"])
 (set-glyph-image gc-pointer-glyph
-		 [resource :resource-type cursor :resource-id "Wait"])
+		 [mswindows-resource :resource-type cursor :resource-id "Wait"])
 
 ;;; msw-mouse.el ends here
--- a/lisp/package-get-base.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/package-get-base.el	Mon Aug 13 10:41:12 2007 +0200
@@ -1,19 +1,19 @@
 (setq package-get-base
 '((eudc
   (standards-version 1.0
-   version "1.09"
-   author-version "1.09"
-   date "1998-06-30"
-   build-date "1998-06-30"
+   version "1.10"
+   author-version "1.10"
+   date "1998-07-12"
+   build-date "1998-07-19"
    maintainer "Oscar Figueiredo <Oscar.Figueiredo@epfl.ch>"
    distribution stable
    priority low
    category "comm"
    dump nil
    description "Emacs Unified Directory Client (LDAP, PH)."
-   filename "eudc-1.09-pkg.tar.gz"
-   md5sum "517bfd3112700fd3dcfc59e02bbb0b12"
-   size 40867
+   filename "eudc-1.10-pkg.tar.gz"
+   md5sum "90e03dbd32651e4b24f973c29665a709"
+   size 41343
    provides (eudc eudc-ldap eudc-ph)
    requires (fsf-compat xemacs-base)
    type regular
@@ -39,38 +39,38 @@
 ))
 (gnats
   (standards-version 1.0
-   version "1.03"
+   version "1.04"
    author-version "3.101"
-   date "1998-04-06"
-   build-date "1998-04-17"
+   date "1998-07-12"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority high
    category "comm"
    dump nil
    description "XEmacs bug reports."
-   filename "gnats-1.03-pkg.tar.gz"
-   md5sum "2b8f3a25baa78ffd23927ac5bb5777b5"
-   size 126412
+   filename "gnats-1.04-pkg.tar.gz"
+   md5sum "9a746086a7f2a4816f6172b39308fbbd"
+   size 126431
    provides (gnats gnats-admin send-pr)
    requires (mail-lib xemacs-base)
    type regular
 ))
 (gnus
   (standards-version 1.0
-   version "1.21"
-   author-version "5.6.23"
+   version "1.22"
+   author-version "5.6.24"
    date "1998-07-06"
-   build-date "1998-07-09"
+   build-date "1998-07-12"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "comm"
    dump nil
    description "The Gnus Newsreader and Mailreader."
-   filename "gnus-1.21-pkg.tar.gz"
-   md5sum "6d58f34293ec00bbd297a6abb98fe2e9"
-   size 1693384
+   filename "gnus-1.22-pkg.tar.gz"
+   md5sum "0b969b84e56f64ff3d17e8eb93b05752"
+   size 1698823
    provides (gnus message)
    requires (gnus w3 mh-e mailcrypt rmail mail-lib xemacs-base)
    type regular
@@ -115,19 +115,19 @@
 ))
 (mh-e
   (standards-version 1.0
-   version "1.05"
+   version "1.06"
    author-version "21.0"
-   date "1998-01-24"
-   build-date "1998-06-14"
+   date "1998-07-12"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
    category "comm"
    dump nil
    description "Front end support for MH."
-   filename "mh-e-1.05-pkg.tar.gz"
-   md5sum "62b8598c55698c74ddfe71e874f0fe5e"
-   size 129257
+   filename "mh-e-1.06-pkg.tar.gz"
+   md5sum "444f2ff3becd5b9c06e880079a8ea094"
+   size 129262
    provides (mh-e)
    requires (mail-lib xemacs-base)
    type regular
@@ -191,19 +191,19 @@
 ))
 (tm
   (standards-version 1.0
-   version "1.09"
+   version "1.10"
    author-version "21.0"
    date "1998-06-09"
-   build-date "1998-07-09"
+   build-date "1998-07-12"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
    category "comm"
    dump nil
    description "Emacs MIME support."
-   filename "tm-1.09-pkg.tar.gz"
-   md5sum "a5697117fc719a9c5a74a62f6b812101"
-   size 253269
+   filename "tm-1.10-pkg.tar.gz"
+   md5sum "f5876ef7eda31c0ef9b6fb2ce63c155d"
+   size 252978
    provides (tm tm-edit tm-view mime-setup)
    requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base)
    type regular
@@ -229,19 +229,19 @@
 ))
 (w3
   (standards-version 1.0
-   version "1.06"
-   author-version "4.0pre18"
-   date "1998-05-01"
-   build-date "1998-05-02"
+   version "1.08"
+   author-version "4.0pre23"
+   date "1998-07-18"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution experimental
    priority high
    category "comm"
    dump nil
    description "A Web browser."
-   filename "w3-1.06-pkg.tar.gz"
-   md5sum "fea5098f9e8dd5b3b82e3ebe7d447b9c"
-   size 581731
+   filename "w3-1.08-pkg.tar.gz"
+   md5sum "ebde805d2dd99decbaaca2d6b4d0a87f"
+   size 586478
    provides (w3 url)
    requires (w3 mail-lib xemacs-base)
    type regular
@@ -286,19 +286,19 @@
 ))
 (mine
   (standards-version 1.0
-   version "1.05"
+   version "1.06"
    author-version "1.8x1"
-   date "1998-03-31"
-   build-date "1998-04-04"
+   date "1998-07-14"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
    category "games"
    dump nil
    description "Minehunt Game."
-   filename "mine-1.05-pkg.tar.gz"
-   md5sum "330cd395304f600487b748d466993e06"
-   size 67568
+   filename "mine-1.06-pkg.tar.gz"
+   md5sum "0993a0ff3511b20183e91e53f96e86d4"
+   size 66396
    provides (xmine)
    requires (xemacs-base)
    type regular
@@ -324,19 +324,19 @@
 ))
 (Sun
   (standards-version 1.0
-   version "1.05"
-   author-version "21.0b35"
-   date "1998-03-06"
-   build-date "1998-04-04"
+   version "1.06"
+   author-version "21.0"
+   date "1998-07-18"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution sun
    priority low
    category "libs"
    dump t
    description "Support for Sparcworks."
-   filename "Sun-1.05-pkg.tar.gz"
-   md5sum "70a776046ea5b12d08ca7276484f6139"
-   size 63826
+   filename "Sun-1.06-pkg.tar.gz"
+   md5sum "fa502e25b1f4d15d0e8a7e47fd41ab36"
+   size 63887
    provides (sccs eos-browser eos-common eos-debugger eos-debugger eos-editor eos-init eos-load eos-menubar eos-toolbar sunpro)
    requires (cc-mode xemacs-base)
    type regular
@@ -495,38 +495,38 @@
 ))
 (tooltalk
   (standards-version 1.0
-   version "1.04"
-   author-version "21.0b35"
-   date "1998-01-24"
-   build-date "1998-04-04"
+   version "1.05"
+   author-version "21.0"
+   date "1998-07-18"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
    category "libs"
    dump t
    description "Support for building with Tooltalk."
-   filename "tooltalk-1.04-pkg.tar.gz"
-   md5sum "60ea390c4aa203ea26d66ddb2f3ad99f"
-   size 9245
+   filename "tooltalk-1.05-pkg.tar.gz"
+   md5sum "19418782ad7ad53d430d40864adc67c0"
+   size 9326
    provides ()
    requires ()
    type regular
 ))
 (xemacs-base
   (standards-version 1.0
-   version "1.21"
+   version "1.22"
    author-version "21.0"
-   date "1998-07-02"
-   build-date "1998-07-09"
+   date "1998-07-12"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "libs"
    dump nil
    description "Fundamental XEmacs support, you almost certainly need this."
-   filename "xemacs-base-1.21-pkg.tar.gz"
-   md5sum "1807f3591bc644c52d41bf472cd30bfc"
-   size 458268
+   filename "xemacs-base-1.22-pkg.tar.gz"
+   md5sum "875c49695bb2bfb80e8d5aaa2ccca929"
+   size 458315
    provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline overlay passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button)
    requires ()
    type regular
@@ -571,21 +571,21 @@
 ))
 (egg-its
   (standards-version 1.0
-   version "1.05"
+   version "1.06"
    author-version "21.0"
-   date "1998-06-20"
-   build-date "1998-07-09"
+   date "1998-07-18"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump t
    description "Wnn (4.2 and 6) support.  SJ3 support."
-   filename "egg-its-1.05-pkg.tar.gz"
-   md5sum "ef131233410ea57fad940b40cb3c786c"
-   size 259670
+   filename "egg-its-1.06-pkg.tar.gz"
+   md5sum "2835798e04502d8236a7102cabf8d58f"
+   size 260134
    provides (egg-cnpinyin egg-cnzhuyin egg-cwnn-leim egg-jisx0201 egg-jsymbol egg-kwnn-leim egg-leim egg-sj3-client egg-sj3-leim egg-sj3 egg-wnn egg)
-   requires (leim mule-base xemacs-base)
+   requires (leim mule-base fsf-compat xemacs-base)
    type regular
 ))
 (leim
@@ -609,19 +609,19 @@
 ))
 (locale
   (standards-version 1.0
-   version "1.04"
-   author-version "21.0b35"
-   date "1998-03-01"
-   build-date "1998-04-04"
+   version "1.07"
+   author-version "21.0"
+   date "1998-07-10"
+   build-date "1998-07-12"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "Localized menubars and localized splash screens."
-   filename "locale-1.04-pkg.tar.gz"
-   md5sum "5d6dd1391ac017f4f210a810db2541cb"
-   size 34651
+   filename "locale-1.07-pkg.tar.gz"
+   md5sum "9aef9faf63f430c1cc2dc6af8b2c2c91"
+   size 29878
    provides ()
    requires (mule-base)
    type regular
@@ -647,38 +647,38 @@
 ))
 (skk
   (standards-version 1.0
-   version "1.06"
+   version "1.07"
    author-version "10.38"
-   date "1998-04-28"
-   build-date "1998-05-01"
+   date "1998-07-18"
+   build-date "1998-07-18"
    maintainer "SL Baur <steve@altair.xemacs.org>"
    distribution mule
    priority medium
    category "mule"
    dump t
    description "Japanese Language Input Method."
-   filename "skk-1.06-pkg.tar.gz"
-   md5sum "ccc92c60519be92efef3c40696897ef7"
-   size 1467006
+   filename "skk-1.07-pkg.tar.gz"
+   md5sum "c67d3ba60b2f2afc6e6b3fdae81bcb71"
+   size 1467655
    provides (skk skk-tut)
    requires (viper mule-base xemacs-base)
    type regular
 ))
 (calc
   (standards-version 1.0
-   version "1.05"
-   author-version "2.02fX1"
-   date "1998-02-27"
-   build-date "1998-06-14"
+   version "1.06"
+   author-version "2.02fX2"
+   date "1998-07-18"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
    category "oa"
    dump nil
    description "Emacs calculator"
-   filename "calc-1.05-pkg.tar.gz"
-   md5sum "cc170d1a19718a152144dfd0a66f6865"
-   size 1165091
+   filename "calc-1.06-pkg.tar.gz"
+   md5sum "e83eaae979e5feea6c8f7588a4e8ee66"
+   size 1165058
    provides (calc)
    requires ()
    type regular
@@ -704,19 +704,19 @@
 ))
 (edit-utils
   (standards-version 1.0
-   version "1.24"
+   version "1.25"
    author-version "21.0"
-   date "1998-06-13"
-   build-date "1998-06-14"
+   date "1998-07-14"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority high
    category "oa"
    dump nil
    description "Miscellaneous editor extensions, you probably need this."
-   filename "edit-utils-1.24-pkg.tar.gz"
-   md5sum "0b7136586f8b47e9b000bcf08f9b75a0"
-   size 584396
+   filename "edit-utils-1.25-pkg.tar.gz"
+   md5sum "91082fa38dddb6f6a22e96e729f109d1"
+   size 583179
    provides (abbrevlist atomic-extents avoid backup-dir balloon-help big-menubar blink-cursor blink-paren bookmark compare-w completion dabbrev desktop detached-minibuf edit-toolbar fast-lock file-part floating-toolbar flow-ctrl foldout func-menu hippie-exp icomplete id-select info-look iswitchb lazy-lock lazy-shot live-icon man mic-paren paren popper mode-motion+ outl-mouse page-ext blink-paren paren permanent-buffers recent-files redo reportmail rsz-minibuf saveconfsavehist saveplace scroll-in-place tempo toolbar-utils tree-menu uniquify where-was-i-db)
    requires (xemacs-base)
    type single
@@ -742,19 +742,19 @@
 ))
 (frame-icon
   (standards-version 1.0
-   version "1.02"
-   author-version "21.0b35"
-   date "1998-02-26"
-   build-date "1998-04-04"
+   version "1.03"
+   author-version "21.0"
+   date "1998-07-14"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
    category "oa"
    dump nil
    description "Set up mode-specific icons for each frame under XEmacs"
-   filename "frame-icon-1.02-pkg.tar.gz"
-   md5sum "82d098425df2fd7e3a7e7d16c9a9e12b"
-   size 33568
+   filename "frame-icon-1.03-pkg.tar.gz"
+   md5sum "82f0714e2ee9ace4b7dba62ea3607f3c"
+   size 33149
    provides (forms forms-mode)
    requires ()
    type regular
@@ -1008,19 +1008,19 @@
 ))
 (os-utils
   (standards-version 1.0
-   version "1.08"
+   version "1.09"
    author-version "21.0"
-   date "1998-06-07"
-   build-date "1998-06-14"
+   date "1998-07-14"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "os"
    dump nil
    description "Miscellaneous O/S utilities."
-   filename "os-utils-1.08-pkg.tar.gz"
-   md5sum "9fdcc24ee2d83c6d214f4afa1f41c617"
-   size 229921
+   filename "os-utils-1.09-pkg.tar.gz"
+   md5sum "7ac91db01771a95da824e97696e4a01b"
+   size 229975
    provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat ps-print tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
@@ -1198,19 +1198,19 @@
 ))
 (prog-modes
   (standards-version 1.0
-   version "1.06"
+   version "1.07"
    author-version "21.0"
-   date "1998-05-04"
-   build-date "1998-07-09"
+   date "1998-07-14"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "prog"
    dump nil
    description "Support for various programming languages."
-   filename "prog-modes-1.06-pkg.tar.gz"
-   md5sum "38d494e334b846fe735f45d573759ed9"
-   size 539915
+   filename "prog-modes-1.07-pkg.tar.gz"
+   md5sum "27293685f9350d63b487084f73840bf8"
+   size 537351
    provides (autoconf-mode cperl-mode eiffel3 f90 fortran ksh-mode m4-mode makefile perl-mode postscript python-mode rexx-mode simula-mode tcl teco verilog-mod)
    requires (mail-lib xemacs-base)
    type regular
@@ -1255,19 +1255,19 @@
 ))
 (vc-cc
   (standards-version 1.0
-   version "1.04"
+   version "1.05"
    author-version "21.0"
-   date "1998-06-30"
-   build-date "1998-07-09"
+   date "1998-07-18"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
    category "prog"
    dump t
    description "Version Control for ClearCase (UnFree) systems."
-   filename "vc-cc-1.04-pkg.tar.gz"
-   md5sum "07557cc75c0b2aafc5966cca1c0a22e2"
-   size 96262
+   filename "vc-cc-1.05-pkg.tar.gz"
+   md5sum "b3dc726242f928f55aaece109f02109f"
+   size 96227
    provides (vc)
    requires (dired xemacs-base)
    type regular
@@ -1312,19 +1312,19 @@
 ))
 (auctex
   (standards-version 1.0
-   version "1.08"
+   version "1.09"
    author-version "9.7p"
    date "1998-04-10"
-   build-date "1998-04-17"
+   build-date "1998-07-12"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "wp"
    dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.08-pkg.tar.gz"
-   md5sum "e79c956bd2a7cfc086d91c399667c2ef"
-   size 305607
+   filename "auctex-1.09-pkg.tar.gz"
+   md5sum "d65325f96c3861db5f7f7b6fe5250b99"
+   size 306623
    provides (auc-old bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-site tex)
    requires (xemacs-base)
    type regular
@@ -1388,19 +1388,19 @@
 ))
 (texinfo
   (standards-version 1.0
-   version "1.09"
+   version "1.10"
    author-version "21.0"
-   date "1998-07-01"
-   build-date "1998-07-09"
+   date "1998-07-14"
+   build-date "1998-07-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority high
    category "wp"
    dump nil
    description "XEmacs TeXinfo support."
-   filename "texinfo-1.09-pkg.tar.gz"
-   md5sum "7ab1fa9774456869027cfc0846d8f3fc"
-   size 127683
+   filename "texinfo-1.10-pkg.tar.gz"
+   md5sum "d5aa51237104b8244ba56b50c02ab51e"
+   size 127723
    provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd)
    requires (xemacs-base)
    type regular
@@ -1426,21 +1426,21 @@
 ))
 (tpu
   (standards-version 1.0
-   version "1.04"
-   author-version "21.0b35"
-   date "1998-01-24"
-   build-date "1998-04-04"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
-   priority high
+   version "1.05"
+   author-version "4.2X"
+   date "1998-07-18"
+   build-date "1998-07-19"
+   maintainer "Kevin Oberman <oberman@es.net>"
+   distribution normal
+   priority medium
    category "wp"
    dump nil
    description "DEC EDIT/TPU support."
-   filename "tpu-1.04-pkg.tar.gz"
-   md5sum "f45c9f761d6a88b2d3bdb4a4af2abf25"
-   size 57425
+   filename "tpu-1.05-pkg.tar.gz"
+   md5sum "ec8dc3e7f57afe9ac4986fea25e1a789"
+   size 57830
    provides (tpu)
-   requires ()
+   requires 
    type regular
 ))
 (viper
--- a/lisp/packages.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/packages.el	Mon Aug 13 10:41:12 2007 +0200
@@ -158,6 +158,7 @@
     "dumped-lisp.el"
     "dumped-pkg-lisp.el"
     "version.el"
+    "very-early-lisp.el"
     "Installation.el")
   "Lisp packages that should not be byte compiled.")
 
--- a/lisp/update-elc.el	Mon Aug 13 10:40:50 2007 +0200
+++ b/lisp/update-elc.el	Mon Aug 13 10:41:12 2007 +0200
@@ -62,9 +62,9 @@
 ;		    ;; -batch gets filtered out.
 ;		    (nthcdr 3 command-line-args))))
 
-(define-function 'defalias 'define-function)
+(setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
 
-(setq load-path (split-path (getenv "EMACSBOOTSTRAPLOADPATH")))
+(load "very-early-lisp" nil t)
 
 (load "find-paths.el")
 (load "packages.el")
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/very-early-lisp.el	Mon Aug 13 10:41:12 2007 +0200
@@ -0,0 +1,74 @@
+;;; very-early-lisp.el --- Lisp support always needed by temacs
+
+;; Copyright (C) 1998 by Free Software Foundation, Inc.
+
+;; Author: SL Baur <steve@altair.xemacs.org>
+;;  Michael Sperber [Mr. Preprocessor] <sperber@Informatik.Uni-Tuebingen.De>
+;; Keywords: internal, dumped
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; XEmacs is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;; 02111-1307, USA.
+
+;;; Synched up with: Not in FSF
+
+;;; Commentary:
+
+;; This file must be loaded by temacs if temacs is to process bytecode
+;; or dumped-lisp.el files.
+
+;;; Code:
+
+(define-function 'defalias 'define-function)
+
+;;; Macros from Michael Sperber to replace read-time Lisp reader macros #-, #+
+;;; ####fixme duplicated in make-docfile.el and update-elc.el
+(defmacro assemble-list (&rest components)
+  "Assemble a list from COMPONENTS.
+This is a poor man's backquote:
+COMPONENTS is a list, each element of which is macro-expanded.
+Each macro-expanded element either has the form (SPLICE stuff),
+in which case stuff must be a list which is spliced into the result.
+Otherwise, the component becomes an element of the list."
+  (cons
+   'append
+   (mapcar #'(lambda (component)
+	       (let ((component (macroexpand-internal component)))
+		 (if (and (consp component)
+			  (eq 'splice (car component)))
+		     (car (cdr component))
+		   (list 'list component))))
+	   components)))
+
+(defmacro when-feature (feature stuff)
+  "Insert STUFF as a list element if FEATURE is a loaded feature.
+This is intended for use as a component of ASSEMBLE-LIST."
+  (list 'splice
+	(if (featurep feature)
+	    (list 'list stuff)
+	  '())))
+
+(defmacro unless-feature (feature stuff)
+  "Insert STUFF as a list element if FEATURE is NOT a loaded feature.
+This is intended for use as a component of ASSEMBLE-LIST."
+  (list 'splice
+	(if (featurep feature)
+	    '()
+	  (list 'list stuff))))
+
+(provide 'very-early-lisp)
+
+;;; very-early-lisp.el ends here
--- a/man/ChangeLog	Mon Aug 13 10:40:50 2007 +0200
+++ b/man/ChangeLog	Mon Aug 13 10:41:12 2007 +0200
@@ -1,3 +1,11 @@
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre7 is released.
+
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre6 is released.
+
 1998-07-12  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre5 is released.
--- a/nt/ChangeLog	Mon Aug 13 10:40:50 2007 +0200
+++ b/nt/ChangeLog	Mon Aug 13 10:41:12 2007 +0200
@@ -1,3 +1,16 @@
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre7 is released.
+
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre6 is released.
+
+1998-07-13  Jonathan Harris  <jhar@tardis.ed.ac.uk>
+
+	* xemacs.mak:
+	  Add path to xemacs.res dependency.
+
 1998-07-12  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre5 is released.
--- a/nt/xemacs.mak	Mon Aug 13 10:40:50 2007 +0200
+++ b/nt/xemacs.mak	Mon Aug 13 10:41:12 2007 +0200
@@ -26,6 +26,7 @@
 
 XEMACS=..
 LISP=$(XEMACS)\lisp
+NT=$(XEMACS)\nt
 
 # Program name and version
 
@@ -357,7 +358,7 @@
 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe :
 	@cd $(LIB_SRC)
 	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) -O2 -W3 -Fe$@ $**
-	@cd $(XEMACS)\nt
+	@cd $(NT)
 
 # Individual dependencies
 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(LIB_SRC)/../src/regex.c
@@ -377,7 +378,6 @@
 
 # runemacs proglet
 
-NT = $(XEMACS)\nt
 RUNEMACS = $(XEMACS)\src\runemacs.exe
 
 $(RUNEMACS): $(NT)\runemacs.c $(NT)\xemacs.res
@@ -783,7 +783,7 @@
 	$(OUTDIR)\vm-limit.obj \
 	$(OUTDIR)\widget.obj \
 	$(OUTDIR)\window.obj \
-	xemacs.res
+	$(NT)\xemacs.res
 
 # Rules
 
@@ -813,7 +813,7 @@
   $(TEMACS_LFLAGS) $(TEMACS_OBJS) $(TEMACS_LIBS)
 <<
 
-xemacs.res: xemacs.rc
+$(NT)\xemacs.res: xemacs.rc
 	rc xemacs.rc
 
 # MSDEV Source Broswer file. "*.sbr" is too inclusive but this is harmless
@@ -855,7 +855,7 @@
 	cd $(TEMACS_DIR)
 	set EMACSBOOTSTRAPLOADPATH=$(LISP)
 	-1 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\loadup.el dump
-	cd $(XEMACS)\nt
+	@cd $(NT)
 	@if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@
 
 #------------------------------------------------------------------------------
--- a/src/ChangeLog	Mon Aug 13 10:40:50 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:41:12 2007 +0200
@@ -1,3 +1,51 @@
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre7 is released.
+
+1998-07-19  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 21.0-pre6 is released.
+
+1998-07-12  Oscar Figueiredo  <Oscar.Figueiredo@di.epfl.ch>
+
+	* eldap.c (Fldap_search_internal): When converting the list of
+	attributes to search Copy the final 0 from Lisp strings to C
+	strings.
+	Check base, not Vldap_default_base as a a string
+
+1998-07-13  Jonathan Harris  <jhar@tardis.ed.ac.uk>
+
+	* nt.c: Remove Vstdio_str; already defined in console-stream.c.
+
+	* unexnt.c: Unconditionally define bss_start and bss_size, and
+	  ensure that they don't go in the .bss section.
+
+1998-07-17  Olivier Galibert  <galibert@pobox.com>
+
+	* glyphs-x.c (convert_EImage_to_XImage):  Fix previous patch (conv
+	byte order is dependant  of  the local  byte order).
+	From Takeshi Hagiwara <hagiwara@ie.niigata-u.ac.jp>
+
+1998-07-18  SL Baur  <steve@altair.xemacs.org>
+
+	* glyphs-msw.c (mswindows_resource_normalize): Qresource ->
+	Qmswindows_resource.
+	From Jonathan Harris <jhar@tardis.ed.ac.uk>
+	
+1998-07-12  SL Baur  <steve@altair.xemacs.org>
+
+	* general.c (syms_of_general): Add defsymbol for Qresource.
+
+	* glyphs-msw.c (vars_of_glyphs_mswindows): Rename Qresource to
+	Qmswindows_resource.
+	(TopLevel): Rename 'resource image format to 'mswindows_resource.
+	(mswindows_resource_validate): Rename.
+	(mswindows_resource_normalize): Rename.
+	(mswindows_resource_possible_dest_types): Rename.
+	(mswindows_resource_instantiate): Rename.
+	(image_instantiator_format_create_glyphs_mswindows): Replace
+	`resource' with `mswindows.resource'.
+
 1998-07-12  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 21.0-pre5 is released.
--- a/src/eldap.c	Mon Aug 13 10:40:50 2007 +0200
+++ b/src/eldap.c	Mon Aug 13 10:41:12 2007 +0200
@@ -427,7 +427,7 @@
     }
   if (!NILP (base))
     {
-      CHECK_STRING (Vldap_default_base);
+      CHECK_STRING (base);
     }
 
   /* Search scope */
@@ -456,8 +456,9 @@
 	  CHECK_STRING (current);
 	  ldap_attributes[i] =
 	    alloca_array (char, 1 + XSTRING_LENGTH (current));
+          /* XSTRING_LENGTH is increased by one in order to copy the final 0 */
 	  memcpy (ldap_attributes[i],
-		  XSTRING_DATA (current), XSTRING_LENGTH (current));
+		  XSTRING_DATA (current), 1 + XSTRING_LENGTH (current));
 	  ++i;
 	}
       ldap_attributes[i] = NULL;
--- a/src/general.c	Mon Aug 13 10:40:50 2007 +0200
+++ b/src/general.c	Mon Aug 13 10:41:12 2007 +0200
@@ -298,6 +298,7 @@
   defsymbol (&Qrassoc, "rassoc");
   defsymbol (&Qrassq, "rassq");
   defsymbol (&Qrequire, "require");
+  defsymbol (&Qresource, "resource");
   defsymbol (&Qreturn, "return");
   defsymbol (&Qreverse, "reverse");
   defsymbol (&Qright, "right");
--- a/src/glyphs-msw.c	Mon Aug 13 10:40:50 2007 +0200
+++ b/src/glyphs-msw.c	Mon Aug 13 10:41:12 2007 +0200
@@ -52,8 +52,9 @@
 Lisp_Object Vmswindows_bitmap_file_path;
 static	COLORREF transparent_color = RGB (1,1,1);
 
-DEFINE_IMAGE_INSTANTIATOR_FORMAT (resource);
+DEFINE_IMAGE_INSTANTIATOR_FORMAT (mswindows_resource);
 Lisp_Object Q_resource_type, Q_resource_id;
+Lisp_Object Qmswindows_resource;
 
 static void
 mswindows_initialize_dibitmap_image_instance (struct Lisp_Image_Instance *ii,
@@ -940,7 +941,7 @@
  **********************************************************************/
 
 static void
-resource_validate (Lisp_Object instantiator)
+mswindows_resource_validate (Lisp_Object instantiator)
 {
   if ((NILP (find_keyword_in_vector (instantiator, Q_file)) 
        &&
@@ -952,7 +953,7 @@
 }
 
 static Lisp_Object
-resource_normalize (Lisp_Object inst, Lisp_Object console_type)
+mswindows_resource_normalize (Lisp_Object inst, Lisp_Object console_type)
 {
   /* This function can call lisp */
   Lisp_Object file = Qnil;
@@ -980,14 +981,14 @@
   }
 
   {
-    Lisp_Object result = alist_to_tagged_vector (Qresource, alist);
+    Lisp_Object result = alist_to_tagged_vector (Qmswindows_resource, alist);
     free_alist (alist);
     RETURN_UNGCPRO (result);
   }
 }
 
 static int
-resource_possible_dest_types (void)
+mswindows_resource_possible_dest_types (void)
 {
   return IMAGE_POINTER_MASK | IMAGE_COLOR_PIXMAP_MASK;
 }
@@ -1108,7 +1109,7 @@
 }
 
 static void
-resource_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
+mswindows_resource_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 		    Lisp_Object pointer_fg, Lisp_Object pointer_bg,
 		    int dest_mask, Lisp_Object domain)
 {
@@ -1960,24 +1961,25 @@
   IIFORMAT_VALID_KEYWORD (bmp, Q_data, check_valid_string);
   IIFORMAT_VALID_KEYWORD (bmp, Q_file, check_valid_string);
 
-  INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (resource, "resource");
+  INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (mswindows_resource,
+					"mswindows-resource");
 
-  IIFORMAT_HAS_METHOD (resource, validate);
-  IIFORMAT_HAS_METHOD (resource, normalize);
-  IIFORMAT_HAS_METHOD (resource, possible_dest_types);
-  IIFORMAT_HAS_METHOD (resource, instantiate);
+  IIFORMAT_HAS_METHOD (mswindows_resource, validate);
+  IIFORMAT_HAS_METHOD (mswindows_resource, normalize);
+  IIFORMAT_HAS_METHOD (mswindows_resource, possible_dest_types);
+  IIFORMAT_HAS_METHOD (mswindows_resource, instantiate);
 
-  IIFORMAT_VALID_KEYWORD (resource, Q_resource_type, 
+  IIFORMAT_VALID_KEYWORD (mswindows_resource, Q_resource_type, 
 			  check_valid_resource_symbol);
-  IIFORMAT_VALID_KEYWORD (resource, Q_resource_id, check_valid_resource_id);
-  IIFORMAT_VALID_KEYWORD (resource, Q_file, check_valid_string);
+  IIFORMAT_VALID_KEYWORD (mswindows_resource, Q_resource_id, check_valid_resource_id);
+  IIFORMAT_VALID_KEYWORD (mswindows_resource, Q_file, check_valid_string);
 }
 
 void
 vars_of_glyphs_mswindows (void)
 {
   Fprovide (Qbmp);
-  Fprovide (Qresource);
+  Fprovide (Qmswindows_resource);
   DEFVAR_LISP ("mswindows-bitmap-file-path", &Vmswindows_bitmap_file_path /*
 A list of the directories in which mswindows bitmap files may be found.
 This is used by the `make-image-instance' function.
--- a/src/glyphs-x.c	Mon Aug 13 10:40:50 2007 +0200
+++ b/src/glyphs-x.c	Mon Aug 13 10:41:12 2007 +0200
@@ -198,10 +198,17 @@
 	      gr = *ip++;
 	      bl = *ip++;
 	      conv.val = pixarray[QUANT_GET_COLOR(qtable,rd,gr,bl)];
+#if WORDS_BIGENDIAN
 	      if (outimg->byte_order == MSBFirst)
 		for (q = 4-byte_cnt; q < 4; q++) *dp++ = conv.cp[q];
 	      else
+		for (q = 3; q >= 4-byte_cnt; q--) *dp++ = conv.cp[q];
+#else
+	      if (outimg->byte_order == MSBFirst)
+		for (q = byte_cnt-1; q >= 0; q--) *dp++ = conv.cp[q];
+	      else
 		for (q = 0; q < byte_cnt; q++) *dp++ = conv.cp[q];
+#endif
 	    }
 	}
       xfree(qtable);
@@ -266,10 +273,17 @@
 		bl = *ip++ >> (8 - bbits);
 
 	      conv.val = (rd << rshift) | (gr << gshift) | (bl << bshift);
+#if WORDS_BIGENDIAN
 	      if (outimg->byte_order == MSBFirst)
 		for (q = 4-byte_cnt; q < 4; q++) *dp++ = conv.cp[q];
 	      else
+		for (q = 3; q >= 4-byte_cnt; q--) *dp++ = conv.cp[q];
+#else
+	      if (outimg->byte_order == MSBFirst)
+		for (q = byte_cnt-1; q >= 0; q--) *dp++ = conv.cp[q];
+	      else
 		for (q = 0; q < byte_cnt; q++) *dp++ = conv.cp[q];
+#endif
 	    }
 	}
     }  
--- a/src/nt.c	Mon Aug 13 10:40:50 2007 +0200
+++ b/src/nt.c	Mon Aug 13 10:41:12 2007 +0200
@@ -1676,8 +1676,6 @@
   }
 }
 #ifndef HAVE_TTY
-Lisp_Object Vstdio_str;
-
 Lisp_Object
 tty_semi_canonicalize_console_connection (Lisp_Object connection,
 					  Error_behavior errb)
--- a/src/unexnt.c	Mon Aug 13 10:40:50 2007 +0200
+++ b/src/unexnt.c	Mon Aug 13 10:41:12 2007 +0200
@@ -97,10 +97,8 @@
 DWORD  data_size = UNINIT_LONG;
 
 /* Cached info about the .bss section in the executable.  */
-#ifndef DUMP_SEPARATE_SECTION
-PUCHAR bss_start = 0;
-DWORD  bss_size = 0;
-#endif
+PUCHAR bss_start = UNINIT_PTR;
+DWORD  bss_size = UNINIT_LONG;
 
 #ifdef HAVE_NTGUI
 HINSTANCE hinst = NULL;
@@ -479,7 +477,7 @@
     }
 
 #ifndef DUMP_SEPARATE_SECTION
-  if (!bss_start)
+  if (bss_start == UNINIT_PTR)
     {
       /* Starting with MSVC 4.0, the .bss section has been eliminated
 	 and appended virtually to the end of the .data section.  Our
@@ -496,6 +494,8 @@
 	+ data_section->VirtualAddress;
       bss_size = (char*)&my_ebss - (char*)bss_start;
     }
+#else
+  bss_size = 0;
 #endif
 }
 
--- a/version.sh	Mon Aug 13 10:40:50 2007 +0200
+++ b/version.sh	Mon Aug 13 10:41:12 2007 +0200
@@ -2,7 +2,7 @@
 emacs_major_version=21
 emacs_minor_version=0
 emacs_beta_version=
-xemacs_codename="Zhong Wei"
+xemacs_codename="Benadir"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1