Mercurial > hg > xemacs-beta

changeset 329:58bac07dfa74 r21-0-62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0-62
author cvs
date Mon, 13 Aug 2007 10:48:41 +0200
parents 2229f69ea3e0
children a33651c9de0e
files CHANGES-beta ChangeLog lib-src/ChangeLog lisp/ChangeLog lisp/package-get.el man/ChangeLog nt/ChangeLog nt/README nt/Todo nt/xemacs.mak nt/xemacs95.mak src/ChangeLog src/gui-x.c version.sh
diffstat 14 files changed, 1130 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES-beta	Mon Aug 13 10:48:18 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:48:41 2007 +0200
@@ -1,4 +1,7 @@
 							-*- indented-text -*-
+to 21.0 "Pyrenean"
+-- 21.2 sync of mswindows and package fixes that got away.
+
 to 21.0 "Poitou61"
 -- mswindows modeline crash fix from Jonathan Harris
 -- picon glyph fix from Gunnar Evermann
--- a/ChangeLog	Mon Aug 13 10:48:18 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:48:41 2007 +0200
@@ -1,3 +1,7 @@
+1999-01-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.62 is released
+
 1999-01-04  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.61 is released
--- a/lib-src/ChangeLog	Mon Aug 13 10:48:18 2007 +0200
+++ b/lib-src/ChangeLog	Mon Aug 13 10:48:41 2007 +0200
@@ -1,3 +1,7 @@
+1999-01-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.62 is released
+
 1999-01-04  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.61 is released
--- a/lisp/ChangeLog	Mon Aug 13 10:48:18 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:48:41 2007 +0200
@@ -1,3 +1,17 @@
+1999-01-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.62 is released
+
+1999-01-04  Jan Vroonhof  <vroonhof@math.ethz.ch>
+
+	*  package-get: Sync again with 21.2 version (undoes premature 
+	   patch applied by mistake).
+
+1998-12-02  Gunnar Evermann  <ge204@eng.cam.ac.uk>
+
+	* package-get.el (package-get-download-sites): change
+	ftp.doc.ic.ac.uk to sunsite.doc.ic.ac.uk
+
 1999-01-04  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.61 is released
--- a/lisp/package-get.el	Mon Aug 13 10:48:18 2007 +0200
+++ b/lisp/package-get.el	Mon Aug 13 10:48:41 2007 +0200
@@ -198,7 +198,7 @@
     ("uniroma2.it" "ftp.uniroma2.it" "unix/misc/dist/XEMACS/packages")
     ("icm.edu.pl" "ftp.icm.edu.pl" "pub/unix/editors/xemacs/packages")
     ("sunet.se" "ftp.sunet.se" "pub/gnu/xemacs/packages")
-    ("doc.ic.ac.uk" "ftp.doc.ic.ac.uk" "packages/xemacs/packages")
+    ("doc.ic.ac.uk" "sunsite.doc.ic.ac.uk" "packages/xemacs/packages")
     ("srcc.msu.su" "ftp1.srcc.msu.su" "mirror/ftp.xemacs.org/packages")
 
     ;; Asia
@@ -261,8 +261,7 @@
   "Build the `Add Download Site' menu."
   (mapcar (lambda (site)
             (vector (car site)
-                    `(lambda ()
-		       (interactive) (package-ui-add-site (quote ,(cdr site))))
+               `(package-ui-add-site (quote ,(cdr site)))
 		    :style 'toggle :selected
 		    `(member (quote ,(cdr site)) package-get-remote)))
           package-get-download-sites))
@@ -324,12 +323,10 @@
           (and (not nil-if-not-found)
                file)))))
 
-(defun package-get-locate-index-file (force-current)
-  "Locate the package-get index file.
-If FORCE-CURRENT is non-nil, require a current copy to be found."
-  (when (and force-current (not package-get-remote))
-    (error "No remote package sites specified in `package-get-remote'"))
-  (or (package-get-locate-file package-get-base-filename t (not force-current))
+(defun package-get-locate-index-file (no-remote)
+  "Locate the package-get index file.  Do not return remote paths if NO-REMOTE
+is non-nil."
+  (or (package-get-locate-file package-get-base-filename t no-remote)
       (locate-data-file package-get-base-filename)
       package-get-base-filename))
 
@@ -338,7 +335,7 @@
 (defun package-get-maybe-save-index (filename)
   "Offer to save the current buffer as the local package index file,
 if different."
-  (let ((location (package-get-locate-index-file nil)))
+  (let ((location (package-get-locate-index-file t)))
     (unless (and filename (equal filename location))
       (unless (equal (md5 (current-buffer))
 		     (with-temp-buffer
@@ -356,7 +353,7 @@
   "Update the package-get database file with entries from DB-FILE.
 Unless FORCE-CURRENT is non-nil never try to update the database."
   (interactive
-   (let ((dflt (package-get-locate-index-file t)))
+   (let ((dflt (package-get-locate-index-file nil)))
      (list (read-file-name "Load package-get database: "
                            (file-name-directory dflt)
                            dflt
@@ -364,7 +361,7 @@
                            (file-name-nondirectory dflt)))))
   (setq db-file (expand-file-name (or db-file
                                       (package-get-locate-index-file
-                                       force-current))))
+				         (not force-current)))))
   (if (not (file-exists-p db-file))
       (error "Package-get database file `%s' does not exist" db-file))
   (if (not (file-readable-p db-file))
--- a/man/ChangeLog	Mon Aug 13 10:48:18 2007 +0200
+++ b/man/ChangeLog	Mon Aug 13 10:48:41 2007 +0200
@@ -1,3 +1,7 @@
+1999-01-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.62 is released
+
 1999-01-04  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.61 is released
--- a/nt/ChangeLog	Mon Aug 13 10:48:18 2007 +0200
+++ b/nt/ChangeLog	Mon Aug 13 10:48:41 2007 +0200
@@ -1,3 +1,14 @@
+1999-01-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.62 is released
+
+1998-12-11  Adrian Aichner  <aichner@ecf.teradyne.com>
+
+	* xemacs.mak (DOC_SRC2): CLASH_DETECTION is not supported under
+ 	native Windows NT.  Therefore src\filelock.c is not to be
+ 	compiled.
+	(TEMACS_OBJS): Consequently, don't link in $(OUTDIR)\filelock.obj.
+
 1999-01-04  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.61 is released
--- a/nt/README	Mon Aug 13 10:48:18 2007 +0200
+++ b/nt/README	Mon Aug 13 10:48:41 2007 +0200
@@ -59,7 +59,8 @@
     time of writing) and read the README for details on how to build it.
 
 5.  cd to the nt subdirectory of the xemacs distribution and build xemacs:
-    `nmake install -f xemacs.mak`, but read on before hitting Enter.
+    `nmake install -f xemacs.mak` or `nmake install -f xemacs95.mak`
+     under windows 95 and windows 98, but read on before hitting Enter.
 
 6.  If you're building with XPM support, add this to the nmake command line:
 	HAVE_XPM=1 XPM_DIR="x:\location\of\your\xpm\sources"
--- a/nt/Todo	Mon Aug 13 10:48:18 2007 +0200
+++ b/nt/Todo	Mon Aug 13 10:48:41 2007 +0200
@@ -2,19 +2,7 @@
 # mail me and I'll update the table below.
 
 # Core NT issues
-    1. Subprocess support is completely broken. 
-    2. Networking support is completely broken. This is due to the fact that
-       the model relies on the subprocess support also working. 
-    4. No binary release. We know a binary release would be A Good Thing.
-       However we want to make things stable before producing one so we don't
-       have to field too many problems. Sorry. 
-    5. Support for dired is perhaps not quite there. We need to port ls-lisp.el
-       from FSF Emacs. 
-    6. Currently the backup files do not get the same permissions as the file
-       being edited. August Hill is looking at this one. 
-    7. Verify that CRLF issues are dealt with correctly. Marc Paquette is
-       looking at this. 
-    8. Use the registry to store the root directory(ies) of lisp packages; that
+    1. Use the registry to store the root directory(ies) of lisp packages; that
        is the path name, not the elisp files.
 
 # X issues
@@ -28,13 +16,7 @@
     2. Can't change bold, italic or bold-italic face fonts
     3. Bogus delay when setting default- or initial-frame-plist
     4. Short timeouts don't seem to be very accurate
-    5. Scrollbar dragging.  Redisplay isn't called while dragging.
-       Also can't retrieve 32 bit tracking position with GetScrollInfo()
-    6. Menubar
     7. Palette handling
-    8. Middle mouse button emulation
-    9. Drag'n'drop
-   10. Images
 
 Old Issues. 
 
--- a/nt/xemacs.mak	Mon Aug 13 10:48:18 2007 +0200
+++ b/nt/xemacs.mak	Mon Aug 13 10:48:41 2007 +0200
@@ -624,7 +624,6 @@
  $(XEMACS)\src\faces.c \
  $(XEMACS)\src\file-coding.c \
  $(XEMACS)\src\fileio.c \
- $(XEMACS)\src\filelock.c \
  $(XEMACS)\src\filemode.c \
  $(XEMACS)\src\floatfns.c \
  $(XEMACS)\src\fns.c 
@@ -869,7 +868,6 @@
 	$(OUTDIR)\faces.obj \
 	$(OUTDIR)\file-coding.obj \
 	$(OUTDIR)\fileio.obj \
-	$(OUTDIR)\filelock.obj \
 	$(OUTDIR)\filemode.obj \
 	$(OUTDIR)\floatfns.obj \
 	$(OUTDIR)\fns.obj \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nt/xemacs95.mak	Mon Aug 13 10:48:41 2007 +0200
@@ -0,0 +1,1070 @@
+#   Makefile for Microsoft NMAKE
+#   Copyright (C) 1995 Board of Trustees, University of Illinois.
+#   Copyright (C) 1995, 1996 Ben Wing.
+#   Copyright (C) 1995 Sun Microsystems, Inc.
+#   Copyright (C) 1998 Free Software Foundation, Inc.
+#
+# 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.
+#
+
+XEMACS=..
+LISP=$(XEMACS)\lisp
+NT=$(XEMACS)\nt
+
+# Program name and version
+
+!include "..\version.sh"
+
+!if !defined(INFODOCK)
+INFODOCK=0
+!endif
+
+!if $(INFODOCK)
+INFODOCK_VERSION_STRING=$(infodock_major_version).$(infodock_minor_version).$(infodock_build_version)
+PROGRAM_DEFINES=-DINFODOCK 					\
+	-DPATH_VERSION=\"$(INFODOCK_VERSION_STRING)\"		\
+	-DPATH_PROGNAME=\"infodock\" 				\
+	-DINFODOCK_MAJOR_VERSION=$(infodock_major_version)	\
+	-DINFODOCK_MINOR_VERSION=$(infodock_minor_version)	\
+	-DINFODOCK_BUILD_VERSION=$(infodock_build_version)
+!else
+!if "$(emacs_beta_version)" != ""
+XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)-b$(emacs_beta_version)
+!else
+XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)
+!endif
+PROGRAM_DEFINES=						\
+	-DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\"		\
+	-DPATH_PROGNAME=\"xemacs\"
+!endif
+
+#
+# Command line options defaults
+#
+!if !defined(INSTALL_DIR)
+! if $(INFODOCK)
+INSTALL_DIR=c:\Program Files\Infodock\Infodock-$(INFODOCK_VERSION_STRING)
+! else
+INSTALL_DIR=c:\Program Files\XEmacs\XEmacs-$(XEMACS_VERSION_STRING)
+! endif
+!endif
+!if !defined(PACKAGE_PATH)
+! if !defined(PACKAGE_PREFIX)
+PACKAGE_PREFIX=c:\Program Files\XEmacs
+! endif
+PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\mule-packages;$(PACKAGE_PREFIX)\xemacs-packages
+!endif
+PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)"
+!if !defined(HAVE_MSW)
+HAVE_MSW=1
+!endif
+!if !defined(HAVE_X)
+HAVE_X=0
+!endif
+!if !defined(HAVE_MULE)
+HAVE_MULE=0
+!endif
+!if !defined(HAVE_XPM)
+HAVE_XPM=0
+!endif
+!if !defined(HAVE_PNG)
+HAVE_PNG=0
+!endif
+!if !defined(HAVE_TIFF)
+HAVE_TIFF=0
+!endif
+!if !defined(HAVE_JPEG)
+HAVE_JPEG=0
+!endif
+!if !defined(HAVE_GIF)
+HAVE_GIF=1
+!endif
+!if !defined(HAVE_TOOLBARS)
+HAVE_TOOLBARS=$(HAVE_XPM)
+!endif
+!if !defined(HAVE_DIALOGS)
+HAVE_DIALOGS=1
+!endif
+!if !defined(HAVE_MSW_C_DIRED)
+HAVE_MSW_C_DIRED=1
+!endif
+!if !defined(HAVE_NATIVE_SOUND)
+HAVE_NATIVE_SOUND=1
+!endif
+!if !defined(DEBUG_XEMACS)
+DEBUG_XEMACS=0
+!endif
+!if !defined(USE_UNION_TYPE)
+USE_UNION_TYPE=0
+!endif
+!if !defined(USE_MINIMAL_TAGBITS)
+USE_MINIMAL_TAGBITS=0
+!endif
+!if !defined(USE_INDEXED_LRECORD_IMPLEMENTATION)
+USE_INDEXED_LRECORD_IMPLEMENTATION=0
+!endif
+
+#
+# System configuration
+#
+!if !defined(PROCESSOR_ARCHITECTURE) && "$(OS)" != "Windows_NT"
+EMACS_CONFIGURATION=i386-pc-win32
+!else if "$(PROCESSOR_ARCHITECTURE)" == "x86"
+EMACS_CONFIGURATION=i386-pc-win32
+!else if "$(PROCESSOR_ARCHITECTURE)" == "MIPS"
+EMACS_CONFIGURATION=mips-pc-win32
+!else if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA"
+EMACS_CONFIGURATION=alpha-pc-win32
+!else if "$(PROCESSOR_ARCHITECTURE)" == "PPC"
+EMACS_CONFIGURATION=ppc-pc-win32
+!else
+! error Unknown processor architecture type $(PROCESSOR_ARCHITECTURE)
+!endif
+
+#
+# Conf error checks
+#
+CONFIG_ERROR=0
+!if $(INFODOCK) && !exist("..\..\Infodock.rules")
+!message Cannot build InfoDock without InfoDock sources
+CONFIG_ERROR=1
+!endif
+!if !$(HAVE_MSW) && !$(HAVE_X)
+!message Please specify at least one HAVE_MSW=1 and/or HAVE_X=1
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_X) && !defined(X11_DIR)
+!message Please specify root directory for your X11 installation: X11_DIR=path
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_X) && defined(X11_DIR) && !exist("$(X11_DIR)\LIB\X11.LIB")
+!message Specified X11 directory does not contain "$(X11_DIR)\LIB\X11.LIB"
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_XPM) && !defined(XPM_DIR)
+!message Please specify root directory for your XPM installation: XPM_DIR=path
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_XPM) && defined(XPM_DIR) && !exist("$(XPM_DIR)\lib\Xpm.lib")
+!message Specified XPM directory does not contain "$(XPM_DIR)\lib\Xpm.lib"
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_PNG) && !defined(PNG_DIR)
+!message Please specify root directory for your PNG installation: PNG_DIR=path
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_PNG) && defined(PNG_DIR) && !exist("$(PNG_DIR)\libpng.lib")
+!message Specified PNG directory does not contain "$(PNG_DIR)\libpng.lib"
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_PNG) && !defined(ZLIB_DIR)
+!message Please specify root directory for your ZLIB installation: ZLIB_DIR=path
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_PNG) && defined(ZLIB_DIR) && !exist("$(ZLIB_DIR)\zlib.lib")
+!message Specified ZLIB directory does not contain "$(ZLIB_DIR)\zlib.lib"
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_TIFF) && !defined(TIFF_DIR)
+!message Please specify root directory for your TIFF installation: TIFF_DIR=path
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_TIFF) && !exist("$(TIFF_DIR)\libtiff\libtiff.lib")
+!message Specified TIFF directory does not contain "$(TIFF_DIR)\libtiff\libtiff.lib"
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_JPEG) && !defined(JPEG_DIR)
+!message Please specify root directory for your JPEG installation: JPEG_DIR=path
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_JPEG) && !exist("$(JPEG_DIR)\libjpeg.lib")
+!message Specified JPEG directory does not contain "$(JPEG_DIR)\libjpeg.lib"
+CONFIG_ERROR=1
+!endif
+!if $(HAVE_MSW) && $(HAVE_TOOLBARS) && !$(HAVE_XPM)
+!error Toolbars require XPM support
+CONFIG_ERROR=1
+!endif
+!if $(CONFIG_ERROR)
+!error Configuration error(s) found
+!endif
+
+#
+# Handle GUNG_HO
+#
+!if defined(GUNG_HO)
+USE_MINIMAL_TAGBITS=$(GUNG_HO)
+USE_INDEXED_LRECORD_IMPLEMENTATION=$(GUNG_HO)
+!endif
+
+#
+# Small configuration report
+#
+!if !defined(CONF_REPORT_ALREADY_PRINTED)
+!if [set CONF_REPORT_ALREADY_PRINTED=1]
+!endif
+!message ------------------------------------------------
+!message XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename) configured for "$(EMACS_CONFIGURATION)".
+!message 
+!message Installation directory is "$(INSTALL_DIR)".
+!message Package path is "$(PACKAGE_PATH)".
+!message 
+!if $(INFODOCK)
+!message Building InfoDock.
+!endif
+!if $(HAVE_MSW)
+!message Compiling in support for native GUI.
+!endif
+!if $(HAVE_X)
+!message Compiling in support for X-Windows.
+!endif
+!if $(HAVE_MULE)
+!message Compiling in MULE.
+!endif
+!if $(HAVE_XPM)
+!message Compiling in support for XPM images.
+!endif
+!if $(HAVE_GIF)
+!message Compiling in support for GIF images.
+!endif
+!if $(HAVE_PNG)
+!message Compiling in support for PNG images.
+!endif
+!if $(HAVE_TIFF)
+!message Compiling in support for TIFF images.
+!endif
+!if $(HAVE_JPEG)
+!message Compiling in support for JPEG images.
+!endif
+!if $(HAVE_TOOLBARS)
+!message Compiling in support for toolbars.
+!endif
+!if $(HAVE_DIALOGS)
+!message Compiling in support for dialogs.
+!endif
+!if $(HAVE_NATIVE_SOUND)
+!message Compiling in support for native sounds.
+!endif
+!if $(HAVE_MSW_C_DIRED)
+# Define HAVE_MSW_C_DIRED to be non-zero if you want XEmacs to use C
+# primitives to significantly speed up dired, at the expense of an
+# additional ~4KB of code.
+!message Compiling in fast dired implementation.
+!endif
+!if $(USE_MINIMAL_TAGBITS)
+!message Using minimal tagbits.
+!endif
+!if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
+!message Using indexed lrecord implementation.
+!endif
+!if $(USE_UNION_TYPE)
+!message Using union type for Lisp object storage.
+!endif
+!if $(DEBUG_XEMACS)
+!message Compiling in extra debug checks. XEmacs will be slow!
+!endif
+!message ------------------------------------------------
+!message 
+!endif # !defined(CONF_REPORT_ALREADY_PRINTED)
+
+#
+# Compiler command echo control. Define VERBOSECC=1 to get vebose compilation.
+#
+!if !defined(VERBOSECC)
+VERBOSECC=0
+!endif
+!if $(VERBOSECC)
+CCV=$(CC) -nologo
+!else
+CCV=@$(CC) -nologo
+!endif
+
+!if $(DEBUG_XEMACS)
+OPT=-Od -Zi
+!else
+OPT=-O2 -G5 -Zi
+!endif
+
+WARN_CPP_FLAGS = -W3
+
+!if $(HAVE_X)
+X_DEFINES=-DHAVE_X_WINDOWS
+X_INCLUDES=-I$(X11_DIR)\include
+X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib
+!endif
+
+!if $(HAVE_MSW)
+MSW_DEFINES=-DHAVE_MS_WINDOWS -DHAVE_SCROLLBARS -DHAVE_MENUBARS
+MSW_INCLUDES=
+MSW_LIBS=
+!if $(HAVE_MSW_C_DIRED)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MSW_C_DIRED
+MSW_C_DIRED_SRC=$(XEMACS)\src\dired-msw.c
+MSW_C_DIRED_OBJ=$(OUTDIR)\dired-msw.obj
+!endif
+!if $(HAVE_XPM)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_XPM -DFOR_MSW
+MSW_INCLUDES=$(MSW_INCLUDES) -I"$(XPM_DIR)" -I"$(XPM_DIR)\lib"
+MSW_LIBS=$(MSW_LIBS) "$(XPM_DIR)\lib\Xpm.lib"
+!endif
+!if $(HAVE_GIF)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_GIF
+MSW_GIF_SRC=$(XEMACS)\src\dgif_lib.c $(XEMACS)\src\gif_io.c
+MSW_GIF_OBJ=$(OUTDIR)\dgif_lib.obj $(OUTDIR)\gif_io.obj
+!endif
+!if $(HAVE_PNG)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_PNG
+MSW_INCLUDES=$(MSW_INCLUDES) -I"$(PNG_DIR)" -I"$(ZLIB_DIR)"
+MSW_LIBS=$(MSW_LIBS) "$(PNG_DIR)\libpng.lib" "$(ZLIB_DIR)\zlib.lib"
+!endif
+!if $(HAVE_TIFF)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_TIFF
+MSW_INCLUDES=$(MSW_INCLUDES) -I"$(TIFF_DIR)\libtiff"
+MSW_LIBS=$(MSW_LIBS) "$(TIFF_DIR)\libtiff\libtiff.lib"
+!endif
+!if $(HAVE_JPEG)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_JPEG
+MSW_INCLUDES=$(MSW_INCLUDES) -I"$(JPEG_DIR)"
+MSW_LIBS=$(MSW_LIBS) "$(JPEG_DIR)\libjpeg.lib"
+!endif
+!if $(HAVE_TOOLBARS)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_TOOLBARS
+MSW_TOOLBAR_SRC=$(XEMACS)\src\toolbar.c $(XEMACS)\src\toolbar-msw.c
+MSW_TOOLBAR_OBJ=$(OUTDIR)\toolbar.obj $(OUTDIR)\toolbar-msw.obj
+MSW_LIBS=$(MSW_LIBS) comctl32.lib
+!endif
+!if $(HAVE_DIALOGS)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_DIALOGS
+MSW_DIALOG_SRC=$(XEMACS)\src\dialog.c $(XEMACS)\src\dialog-msw.c
+MSW_DIALOG_OBJ=$(OUTDIR)\dialog.obj $(OUTDIR)\dialog-msw.obj
+!endif
+!if $(HAVE_NATIVE_SOUND)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_NATIVE_SOUND
+!endif
+!endif
+
+!if $(HAVE_MULE)
+MULE_DEFINES=-DMULE
+!endif
+
+!if $(DEBUG_XEMACS)
+DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG 
+DEBUG_FLAGS= -debugtype:both -debug:full
+!endif
+
+!if $(USE_MINIMAL_TAGBITS)
+TAGBITS_DEFINES=-DUSE_MINIMAL_TAGBITS
+!endif
+!if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
+LRECORD_DEFINES=-DUSE_INDEXED_LRECORD_IMPLEMENTATION
+!endif
+!if $(USE_UNION_TYPE)
+UNION_DEFINES=-DUSE_UNION_TYPE
+!endif
+
+# Hard-coded paths
+
+!if $(INFODOCK)
+PATH_PREFIX=../..
+!else
+PATH_PREFIX=..
+!endif
+
+PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\"
+
+# Generic variables
+
+INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(XEMACS)\nt\inc -I$(XEMACS)\src -I$(XEMACS)\lwlib
+
+DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \
+	$(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) \
+	-DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN -DWINDOWSNT -Demacs \
+	-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
+
+OUTDIR=obj
+
+#
+# Creating simplified versions of Installation and Installation.el
+#
+# Some values cannot be written on the same line with
+# their key, since they cannot be put inside an echo command.
+# Macro substitution (:"=\", :\=\\) can be performed on values in order
+# to create a legal string in LISP for Installation.el.
+#
+!if [echo OS: $(OS)>Installation] ||\
+[echo XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for ^`$(EMACS_CONFIGURATION)^'.>>Installation] ||\
+[echo Where should the build process find the source code?>>Installation] ||\
+[echo $(MAKEDIR:\=\\)>>Installation]
+!endif
+# Compiler Information
+!if defined(CCV) &&\
+[echo What compiler should XEmacs be built with?>>Installation] &&\
+[echo $(CCV)>>Installation]
+!endif
+# Window System Information
+!if [echo What window system should XEmacs use?>>Installation]
+!endif
+!if (defined (HAVE_X) && $(HAVE_X) == 1)
+!if [echo X11>>Installation]
+!endif
+!endif
+!if (defined (HAVE_MSW) && $(HAVE_MSW) == 1)
+!if [echo MS Windows>>Installation]
+!endif
+!endif
+!if (!defined (HAVE_MSW) && !defined (HAVE_X))
+!if [echo Please specify at least one HAVE_MSW^=1 and^/or HAVE_X^=1>>Installation]
+!endif
+!endif
+# Creation of Installation.el
+!if [type Installation] ||\
+[echo (setq Installation-string ">Installation.el] ||\
+[type Installation >>Installation.el] ||\
+[echo ")>>Installation.el]
+!endif
+
+
+#------------------------------------------------------------------------------
+
+default: $(OUTDIR)\nul all 
+
+$(OUTDIR)\nul:
+	-@mkdir $(OUTDIR)
+
+XEMACS_INCLUDES=\
+ $(XEMACS)\src\config.h \
+ $(XEMACS)\src\Emacs.ad.h \
+ $(XEMACS)\src\paths.h \
+ $(XEMACS)\src\puresize-adjust.h
+
+$(XEMACS)\src\config.h:	config.h
+	copy config.h $(XEMACS)\src
+
+$(XEMACS)\src\Emacs.ad.h:	Emacs.ad.h
+	copy Emacs.ad.h $(XEMACS)\src
+
+$(XEMACS)\src\paths.h:	paths.h
+	copy paths.h $(XEMACS)\src
+
+$(XEMACS)\src\puresize-adjust.h:	puresize-adjust.h
+	copy puresize-adjust.h $(XEMACS)\src
+
+#------------------------------------------------------------------------------
+
+# lib-src programs
+
+LIB_SRC = $(XEMACS)\lib-src
+LIB_SRC_DEFINES = -DHAVE_CONFIG_H -DWIN32 -DWINDOWSNT
+
+#
+# Creating config.values to be used by config.el
+#
+CONFIG_VALUES = $(LIB_SRC)\config.values
+!if [echo Creating $(CONFIG_VALUES) && echo ;;; Do not edit this file!>$(CONFIG_VALUES)]
+!endif
+# MAKEDIR has to be made into a string.
+!if [echo blddir>>$(CONFIG_VALUES) && echo ^"$(MAKEDIR:\=\\)\\..^">>$(CONFIG_VALUES)]
+!endif
+!if [echo CC>>$(CONFIG_VALUES) && echo ^"$(CC:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+!if [echo CFLAGS>>$(CONFIG_VALUES) && echo ^"$(CFLAGS:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+!if [echo CPP>>$(CONFIG_VALUES) && echo ^"$(CPP:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+!if [echo CPPFLAGS>>$(CONFIG_VALUES) && echo ^"$(CPPFLAGS:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+!if [echo LISPDIR>>$(CONFIG_VALUES) && echo ^"$(MAKEDIR:\=\\)\\$(LISP:\=\\)^">>$(CONFIG_VALUES)]
+!endif
+# PATH_PACKAGEPATH is already a quoted string.
+!if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)]
+!endif
+
+# Inferred rule
+{$(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 $(NT)
+
+# Individual dependencies
+ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(LIB_SRC)/../src/regex.c
+$(LIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS)
+$(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
+
+LIB_SRC_TOOLS = \
+	$(LIB_SRC)/make-docfile.exe	\
+	$(LIB_SRC)/hexl.exe		\
+	$(LIB_SRC)/movemail.exe		\
+	$(LIB_SRC)/mmencode.exe		\
+	$(LIB_SRC)/sorted-doc.exe	\
+	$(LIB_SRC)/wakeup.exe		\
+	$(LIB_SRC)/etags.exe		
+
+#------------------------------------------------------------------------------
+
+# runemacs proglet
+
+RUNEMACS = $(XEMACS)\src\runemacs.exe
+
+$(RUNEMACS): $(NT)\runemacs.c $(NT)\xemacs.res
+	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc -O2 -W3 -Fe$@ $** kernel32.lib user32.lib
+
+#------------------------------------------------------------------------------
+
+# LASTFILE Library
+
+LASTFILE=$(OUTDIR)\lastfile.lib
+LASTFILE_SRC=$(XEMACS)\src
+LASTFILE_FLAGS=$(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) -Fo$@ -c
+LASTFILE_OBJS= \
+	$(OUTDIR)\lastfile.obj
+
+$(LASTFILE): $(XEMACS_INCLUDES) $(LASTFILE_OBJS)
+	link.exe -lib -nologo -out:$@ $(LASTFILE_OBJS)
+
+$(OUTDIR)\lastfile.obj:	$(LASTFILE_SRC)\lastfile.c
+	 $(CCV) $(LASTFILE_FLAGS) $**
+
+#------------------------------------------------------------------------------
+
+!if $(HAVE_X)
+
+# LWLIB Library
+
+LWLIB=$(OUTDIR)\lwlib.lib
+LWLIB_SRC=$(XEMACS)\lwlib
+LWLIB_FLAGS=$(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) $(DEFINES) \
+ -DNEED_ATHENA -DNEED_LUCID \
+ -D_WINDOWS -DMENUBARS_LUCID -DSCROLLBARS_LUCID -DDIALOGS_ATHENA \
+ -Fo$@ -c
+LWLIB_OBJS= \
+	$(OUTDIR)\lwlib-config.obj \
+	$(OUTDIR)\lwlib-utils.obj \
+	$(OUTDIR)\lwlib-Xaw.obj \
+	$(OUTDIR)\lwlib-Xlw.obj \
+	$(OUTDIR)\lwlib.obj \
+	$(OUTDIR)\xlwmenu.obj \
+	$(OUTDIR)\xlwscrollbar.obj
+
+$(LWLIB): $(LWLIB_OBJS)
+	link.exe -lib -nologo $(DEBUG_FLAGS) -out:$@ $(LWLIB_OBJS)
+
+$(OUTDIR)\lwlib-config.obj:	$(LWLIB_SRC)\lwlib-config.c
+	 $(CCV) $(LWLIB_FLAGS) $**
+
+$(OUTDIR)\lwlib-utils.obj:	$(LWLIB_SRC)\lwlib-utils.c
+	 $(CCV) $(LWLIB_FLAGS) $**
+
+$(OUTDIR)\lwlib-Xaw.obj:	$(LWLIB_SRC)\lwlib-Xaw.c
+	 $(CCV) $(LWLIB_FLAGS) $**
+
+$(OUTDIR)\lwlib-Xlw.obj:	$(LWLIB_SRC)\lwlib-Xlw.c
+	 $(CCV) $(LWLIB_FLAGS) $**
+
+$(OUTDIR)\lwlib.obj:		$(LWLIB_SRC)\lwlib.c
+	 $(CCV) $(LWLIB_FLAGS) $**
+
+$(OUTDIR)\xlwmenu.obj:		$(LWLIB_SRC)\xlwmenu.c
+	 $(CCV) $(LWLIB_FLAGS) $**
+
+$(OUTDIR)\xlwscrollbar.obj:	$(LWLIB_SRC)\xlwscrollbar.c
+	 $(CCV) $(LWLIB_FLAGS) $**
+
+!endif
+#------------------------------------------------------------------------------
+
+DOC=$(LIB_SRC)\DOC
+DOC_SRC1=\
+ $(XEMACS)\src\abbrev.c \
+ $(XEMACS)\src\alloc.c \
+ $(XEMACS)\src\alloca.c \
+ $(XEMACS)\src\blocktype.c \
+ $(XEMACS)\src\buffer.c \
+ $(XEMACS)\src\bytecode.c \
+ $(XEMACS)\src\callint.c \
+ $(XEMACS)\src\callproc.c \
+ $(XEMACS)\src\casefiddle.c \
+ $(XEMACS)\src\casetab.c \
+ $(XEMACS)\src\chartab.c \
+ $(XEMACS)\src\cmdloop.c \
+ $(XEMACS)\src\cmds.c \
+ $(XEMACS)\src\console-stream.c \
+ $(XEMACS)\src\console.c \
+ $(XEMACS)\src\data.c \
+ $(XEMACS)\src\device.c
+DOC_SRC2=\
+ $(XEMACS)\src\dired.c \
+ $(XEMACS)\src\doc.c \
+ $(XEMACS)\src\doprnt.c \
+ $(XEMACS)\src\dragdrop.c \
+ $(XEMACS)\src\dynarr.c \
+ $(XEMACS)\src\editfns.c \
+ $(XEMACS)\src\elhash.c \
+ $(XEMACS)\src\emacs.c \
+ $(XEMACS)\src\eval.c \
+ $(XEMACS)\src\event-stream.c \
+ $(XEMACS)\src\events.c \
+ $(XEMACS)\src\extents.c \
+ $(XEMACS)\src\faces.c \
+ $(XEMACS)\src\file-coding.c \
+ $(XEMACS)\src\fileio.c \
+ $(XEMACS)\src\filemode.c \
+ $(XEMACS)\src\floatfns.c \
+ $(XEMACS)\src\fns.c 
+DOC_SRC3=\
+ $(XEMACS)\src\font-lock.c \
+ $(XEMACS)\src\frame.c \
+ $(XEMACS)\src\free-hook.c \
+ $(XEMACS)\src\general.c \
+ $(XEMACS)\src\glyphs.c \
+ $(XEMACS)\src\glyphs-eimage.c \
+ $(XEMACS)\src\gmalloc.c \
+ $(XEMACS)\src\gui.c  \
+ $(XEMACS)\src\hash.c \
+ $(XEMACS)\src\imgproc.c \
+ $(XEMACS)\src\indent.c \
+ $(XEMACS)\src\insdel.c \
+ $(XEMACS)\src\intl.c \
+ $(XEMACS)\src\keymap.c \
+ $(XEMACS)\src\line-number.c \
+ $(XEMACS)\src\lread.c \
+ $(XEMACS)\src\lstream.c \
+ $(XEMACS)\src\macros.c \
+ $(XEMACS)\src\marker.c
+DOC_SRC4=\
+ $(XEMACS)\src\md5.c \
+ $(XEMACS)\src\menubar.c \
+ $(XEMACS)\src\minibuf.c \
+ $(XEMACS)\src\nt.c \
+ $(XEMACS)\src\ntheap.c \
+ $(XEMACS)\src\ntplay.c \
+ $(XEMACS)\src\ntproc.c \
+ $(XEMACS)\src\objects.c \
+ $(XEMACS)\src\opaque.c \
+ $(XEMACS)\src\print.c \
+ $(XEMACS)\src\process.c \
+ $(XEMACS)\src\process-nt.c \
+ $(XEMACS)\src\profile.c \
+ $(XEMACS)\src\pure.c \
+ $(XEMACS)\src\rangetab.c \
+ $(XEMACS)\src\realpath.c \
+ $(XEMACS)\src\redisplay-output.c \
+ $(XEMACS)\src\redisplay.c \
+ $(XEMACS)\src\regex.c \
+ $(XEMACS)\src\scrollbar.c \
+ $(XEMACS)\src\scrollbar-msw.c \
+ $(XEMACS)\src\search.c \
+ $(XEMACS)\src\signal.c \
+ $(XEMACS)\src\sound.c 
+DOC_SRC5=\
+ $(XEMACS)\src\specifier.c \
+ $(XEMACS)\src\strftime.c \
+ $(XEMACS)\src\symbols.c \
+ $(XEMACS)\src\syntax.c \
+ $(XEMACS)\src\sysdep.c \
+ $(XEMACS)\src\termcap.c  \
+ $(XEMACS)\src\tparam.c \
+ $(XEMACS)\src\undo.c \
+ $(XEMACS)\src\unexnt.c \
+ $(XEMACS)\src\vm-limit.c \
+ $(XEMACS)\src\window.c \
+ $(XEMACS)\src\widget.c
+
+!if $(HAVE_X)
+DOC_SRC6=\
+ $(XEMACS)\src\balloon_help.c \
+ $(XEMACS)\src\console-x.c \
+ $(XEMACS)\src\device-x.c  \
+ $(XEMACS)\src\dialog-x.c \
+ $(XEMACS)\src\EmacsFrame.c \
+ $(XEMACS)\src\EmacsManager.c \
+ $(XEMACS)\src\EmacsShell-sub.c\
+ $(XEMACS)\src\EmacsShell.c \
+ $(XEMACS)\src\event-Xt.c  \
+ $(XEMACS)\src\frame-x.c \
+ $(XEMACS)\src\glyphs-x.c \
+ $(XEMACS)\src\gui-x.c \
+ $(XEMACS)\src\menubar.c \
+ $(XEMACS)\src\menubar-x.c \
+ $(XEMACS)\src\objects-x.c \
+ $(XEMACS)\src\redisplay-x.c \
+ $(XEMACS)\src\scrollbar-x.c \
+ $(XEMACS)\src\balloon-x.c \
+ $(XEMACS)\src\xgccache.c \
+ $(XEMACS)\src\xmu.c \
+ $(XEMACS)\src\xselect.c 
+!endif
+
+!if $(HAVE_MSW)
+DOC_SRC7=\
+ $(XEMACS)\src\console-msw.c \
+ $(XEMACS)\src\device-msw.c  \
+ $(XEMACS)\src\event-msw.c  \
+ $(XEMACS)\src\frame-msw.c \
+ $(XEMACS)\src\glyphs-msw.c \
+ $(XEMACS)\src\menubar-msw.c \
+ $(XEMACS)\src\objects-msw.c \
+ $(XEMACS)\src\redisplay-msw.c \
+ $(XEMACS)\src\scrollbar-msw.c \
+ $(XEMACS)\src\select-msw.c \
+ $(MSW_C_DIRED_SRC) \
+ $(MSW_TOOLBAR_SRC) \
+ $(MSW_DIALOG_SRC) \
+ $(MSW_GIF_SRC)
+!endif
+
+!if $(HAVE_MULE)
+DOC_SRC8=\
+ $(XEMACS)\src\input-method-xlib.c \
+ $(XEMACS)\src\mule.c \
+ $(XEMACS)\src\mule-charset.c \
+ $(XEMACS)\src\mule-ccl.c \
+ $(XEMACS)\src\mule-coding.c
+!endif
+
+!if $(DEBUG_XEMACS)
+DOC_SRC9=\
+ $(XEMACS)\src\debug.c
+!endif
+
+#------------------------------------------------------------------------------
+
+# TEMACS Executable
+
+# This may not exist
+!if "$(emacs_beta_version)" != ""
+EMACS_BETA_VERSION=-DEMACS_BETA_VERSION=$(emacs_beta_version)
+!ENDIF
+
+TEMACS_DIR=$(XEMACS)\src
+TEMACS=$(TEMACS_DIR)\temacs.exe
+TEMACS_BROWSE=$(TEMACS_DIR)\temacs.bsc
+TEMACS_SRC=$(XEMACS)\src
+TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \
+ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib \
+ shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib winmm.lib libc.lib
+TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS) -base:0x1000000\
+ -stack:0x800000 -entry:_start -subsystem:console\
+ -pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \
+ -heap:0x00100000 -out:$@
+TEMACS_CPP_FLAGS= $(WARN_CPP_FLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \
+ -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
+ -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
+ $(EMACS_BETA_VERSION) \
+ -DXEMACS_CODENAME=\"$(xemacs_codename)\" \
+ -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \
+ -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\"
+
+TEMACS_FLAGS=-ML $(WARN_CPP_FALGS) $(OPT) -c $(TEMACS_CPP_FLAGS)
+
+!if $(HAVE_X)
+TEMACS_X_OBJS=\
+	$(OUTDIR)\balloon-x.obj \
+	$(OUTDIR)\balloon_help.obj \
+	$(OUTDIR)\console-x.obj \
+	$(OUTDIR)\device-x.obj \
+	$(OUTDIR)\dialog-x.obj \
+	$(OUTDIR)\EmacsFrame.obj \
+	$(OUTDIR)\EmacsManager.obj \
+	$(OUTDIR)\EmacsShell.obj \
+	$(OUTDIR)\TopLevelEmacsShell.obj\
+	$(OUTDIR)\TransientEmacsShell.obj\
+	$(OUTDIR)\event-Xt.obj \
+	$(OUTDIR)\frame-x.obj \
+	$(OUTDIR)\glyphs-x.obj \
+	$(OUTDIR)\gui-x.obj \
+	$(OUTDIR)\menubar-x.obj \
+	$(OUTDIR)\objects-x.obj \
+	$(OUTDIR)\redisplay-x.obj \
+	$(OUTDIR)\scrollbar-x.obj \
+	$(OUTDIR)\xgccache.obj \
+	$(OUTDIR)\xmu.obj \
+	$(OUTDIR)\xselect.obj
+!endif
+
+!if $(HAVE_MSW)
+TEMACS_MSW_OBJS=\
+	$(OUTDIR)\console-msw.obj \
+	$(OUTDIR)\device-msw.obj \
+	$(OUTDIR)\event-msw.obj \
+	$(OUTDIR)\frame-msw.obj \
+	$(OUTDIR)\glyphs-msw.obj \
+	$(OUTDIR)\menubar-msw.obj \
+	$(OUTDIR)\objects-msw.obj \
+	$(OUTDIR)\redisplay-msw.obj \
+	$(OUTDIR)\scrollbar-msw.obj \
+	$(OUTDIR)\select-msw.obj \
+	$(MSW_C_DIRED_OBJ) \
+	$(MSW_TOOLBAR_OBJ) \
+	$(MSW_DIALOG_OBJ) \
+	$(MSW_GIF_OBJ)
+!endif
+
+!if $(HAVE_MULE)
+TEMACS_MULE_OBJS=\
+	$(OUTDIR)\input-method-xlib.obj \
+	$(OUTDIR)\mule.obj \
+	$(OUTDIR)\mule-charset.obj \
+	$(OUTDIR)\mule-ccl.obj \
+	$(OUTDIR)\mule-coding.obj
+!endif
+
+!if $(DEBUG_XEMACS)
+TEMACS_DEBUG_OBJS=\
+	$(OUTDIR)\debug.obj
+!endif
+
+TEMACS_OBJS= \
+	$(TEMACS_X_OBJS)\
+	$(TEMACS_MSW_OBJS)\
+	$(TEMACS_CODING_OBJS)\
+	$(TEMACS_MULE_OBJS)\
+	$(TEMACS_DEBUG_OBJS)\
+	$(OUTDIR)\abbrev.obj \
+	$(OUTDIR)\alloc.obj \
+	$(OUTDIR)\alloca.obj \
+	$(OUTDIR)\blocktype.obj \
+	$(OUTDIR)\buffer.obj \
+	$(OUTDIR)\bytecode.obj \
+	$(OUTDIR)\callint.obj \
+	$(OUTDIR)\callproc.obj \
+	$(OUTDIR)\casefiddle.obj \
+	$(OUTDIR)\casetab.obj \
+	$(OUTDIR)\chartab.obj \
+	$(OUTDIR)\cmdloop.obj \
+	$(OUTDIR)\cmds.obj \
+	$(OUTDIR)\console-stream.obj \
+	$(OUTDIR)\console.obj \
+	$(OUTDIR)\data.obj \
+	$(OUTDIR)\device.obj \
+	$(OUTDIR)\dired.obj \
+	$(OUTDIR)\doc.obj \
+	$(OUTDIR)\doprnt.obj \
+	$(OUTDIR)\dragdrop.obj \
+	$(OUTDIR)\dynarr.obj \
+	$(OUTDIR)\editfns.obj \
+	$(OUTDIR)\elhash.obj \
+	$(OUTDIR)\emacs.obj \
+	$(OUTDIR)\eval.obj \
+	$(OUTDIR)\event-stream.obj \
+	$(OUTDIR)\events.obj \
+	$(OUTDIR)\extents.obj \
+	$(OUTDIR)\faces.obj \
+	$(OUTDIR)\file-coding.obj \
+	$(OUTDIR)\fileio.obj \
+	$(OUTDIR)\filemode.obj \
+	$(OUTDIR)\floatfns.obj \
+	$(OUTDIR)\fns.obj \
+	$(OUTDIR)\font-lock.obj \
+	$(OUTDIR)\frame.obj \
+	$(OUTDIR)\free-hook.obj \
+	$(OUTDIR)\general.obj \
+	$(OUTDIR)\glyphs.obj \
+	$(OUTDIR)\glyphs-eimage.obj \
+	$(OUTDIR)\gmalloc.obj \
+	$(OUTDIR)\gui.obj \
+	$(OUTDIR)\hash.obj \
+	$(OUTDIR)\indent.obj \
+	$(OUTDIR)\imgproc.obj \
+	$(OUTDIR)\insdel.obj \
+	$(OUTDIR)\intl.obj \
+	$(OUTDIR)\keymap.obj \
+	$(OUTDIR)\line-number.obj \
+	$(OUTDIR)\lread.obj \
+	$(OUTDIR)\lstream.obj \
+	$(OUTDIR)\macros.obj \
+	$(OUTDIR)\menubar.obj \
+	$(OUTDIR)\marker.obj \
+	$(OUTDIR)\md5.obj \
+	$(OUTDIR)\minibuf.obj \
+	$(OUTDIR)\nt.obj \
+	$(OUTDIR)\ntheap.obj \
+	$(OUTDIR)\ntplay.obj \
+	$(OUTDIR)\ntproc.obj \
+	$(OUTDIR)\objects.obj \
+	$(OUTDIR)\opaque.obj \
+	$(OUTDIR)\print.obj \
+	$(OUTDIR)\process.obj \
+	$(OUTDIR)\process-nt.obj \
+	$(OUTDIR)\profile.obj \
+	$(OUTDIR)\pure.obj \
+	$(OUTDIR)\rangetab.obj \
+	$(OUTDIR)\realpath.obj \
+	$(OUTDIR)\redisplay-output.obj \
+	$(OUTDIR)\redisplay.obj \
+	$(OUTDIR)\regex.obj \
+	$(OUTDIR)\scrollbar.obj \
+	$(OUTDIR)\search.obj \
+	$(OUTDIR)\signal.obj \
+	$(OUTDIR)\sound.obj \
+	$(OUTDIR)\specifier.obj \
+	$(OUTDIR)\strftime.obj \
+	$(OUTDIR)\symbols.obj \
+	$(OUTDIR)\syntax.obj \
+	$(OUTDIR)\sysdep.obj \
+	$(OUTDIR)\tparam.obj \
+	$(OUTDIR)\undo.obj \
+	$(OUTDIR)\unexnt.obj \
+	$(OUTDIR)\vm-limit.obj \
+	$(OUTDIR)\widget.obj \
+	$(OUTDIR)\window.obj \
+	$(NT)\xemacs.res
+
+# Rules
+
+.SUFFIXES:
+.SUFFIXES:	.c
+
+# nmake rule
+{$(TEMACS_SRC)}.c{$(OUTDIR)}.obj:
+	$(CCV) $(TEMACS_FLAGS) $< -Fo$@ -Fr$*.sbr
+
+$(OUTDIR)\TopLevelEmacsShell.obj:	$(TEMACS_SRC)\EmacsShell-sub.c
+	$(CCV) $(TEMACS_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $** -Fo$@
+
+$(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
+	$(CCV) $(TEMACS_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $** -Fo$@
+
+$(OUTDIR)\pure.obj: $(TEMACS_SRC)\pure.c $(TEMACS_SRC)\puresize-adjust.h
+
+#$(TEMACS_SRC)\Emacs.ad.h: $(XEMACS)\etc\Emacs.ad
+#	!"sed -f ad2c.sed < $(XEMACS)\etc\Emacs.ad > $(TEMACS_SRC)\Emacs.ad.h"
+
+#$(TEMACS_SRC)\paths.h: $(TEMACS_SRC)\paths.h.in
+#	!"cd $(TEMACS_SRC); cp paths.h.in paths.h"
+
+$(TEMACS): $(TEMACS_INCLUDES) $(TEMACS_OBJS)
+	link.exe @<<
+  $(TEMACS_LFLAGS) $(TEMACS_OBJS) $(TEMACS_LIBS)
+<<
+
+$(NT)\xemacs.res: xemacs.rc
+	rc xemacs.rc
+
+# MSDEV Source Broswer file. "*.sbr" is too inclusive but this is harmless
+$(TEMACS_BROWSE): $(TEMACS_OBJS)
+	@dir /b/s $(OUTDIR)\*.sbr > bscmake.tmp
+	bscmake -nologo -o$@ @bscmake.tmp
+	@del bscmake.tmp
+
+#------------------------------------------------------------------------------
+
+# LISP bits 'n bobs
+
+LOADPATH=$(LISP)
+
+$(DOC): $(LIB_SRC)\make-docfile.exe
+	-del $(DOC)
+	$(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC2)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC3)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC4)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC5)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC6)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC7)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC8)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC9)
+
+$(LISP)\Installation.el: Installation.el
+	copy Installation.el $(LISP)
+
+update-elc: $(LISP)\Installation.el
+	set EMACSBOOTSTRAPLOADPATH=$(LISP)
+	$(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\update-elc.el
+
+# This rule dumps xemacs and then possibly spawns sub-make if PURESPACE
+# requirements has changed.
+dump-xemacs: $(TEMACS)
+	@echo >$(TEMACS_DIR)\SATISFIED
+	cd $(TEMACS_DIR)
+	set EMACSBOOTSTRAPLOADPATH=$(LISP)
+	-1 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\loadup.el dump
+	@cd $(NT)
+	@if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@
+
+#------------------------------------------------------------------------------
+
+# use this rule to build the complete system
+all:	$(OUTDIR)\nul $(LASTFILE) $(LWLIB) $(LIB_SRC_TOOLS) $(RUNEMACS) \
+	$(TEMACS) $(TEMACS_BROWSE) update-elc $(DOC) dump-xemacs
+
+temacs: $(TEMACS)
+
+# use this rule to install the system
+install:	all
+	@echo Installing in $(INSTALL_DIR) ...
+	@echo PlaceHolder > PlaceHolder
+	@xcopy /q PROBLEMS "$(INSTALL_DIR)\"
+	@xcopy /q PlaceHolder "$(INSTALL_DIR)\lock\"
+	@del "$(INSTALL_DIR)\lock\PlaceHolder"
+	@xcopy /q $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
+	@copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+	@copy $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+	@copy $(XEMACS)\src\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+	@copy $(RUNEMACS) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+	@xcopy /e /q $(XEMACS)\etc  "$(INSTALL_DIR)\etc\"
+	@xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\"
+	@xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
+	@echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
+	@del "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\"
+	@del "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
+	@del "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
+	@del PlaceHolder
+
+distclean:
+	del *.bak
+	del *.orig
+	del *.rej
+	del *.pdb
+	del *.tmp
+	cd $(OUTDIR)
+	del *.obj
+	del *.sbr
+	del *.lib
+	cd $(XEMACS)\$(TEMACS_DIR)
+	del puresize-adjust.h
+	del config.h
+	del paths.h
+	del Emacs.ad.h
+	del *.bak
+	del *.orig
+	del *.rej
+	del *.exe
+	del *.map
+	del *.bsc
+	del *.pdb
+	cd $(LIB_SRC)
+	del DOC
+	del *.bak
+	del *.orig
+	del *.rej
+	del *.exe
+	del $(CONFIG_VALUES)
+	cd $(LISP)
+	-del /s /q *.bak *.elc *.orig *.rej
+
+depend:
+	mkdepend -f xemacs.mak -p$(OUTDIR)\ -o.obj -w9999 -- $(TEMACS_CPP_FLAGS) --  $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(LASTFILE_SRC)\lastfile.c $(LIB_SRC)\make-docfile.c .\runemacs.c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
--- a/src/ChangeLog	Mon Aug 13 10:48:18 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:48:41 2007 +0200
@@ -1,3 +1,7 @@
+1999-01-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.62 is released
+
 1999-01-04  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.61 is released
--- a/src/gui-x.c	Mon Aug 13 10:48:18 2007 +0200
+++ b/src/gui-x.c	Mon Aug 13 10:48:41 2007 +0200
@@ -401,6 +401,8 @@
 	  if      (EQ (key, Q_active))   active_p   = val;
 	  else if (EQ (key, Q_suffix))   suffix     = val;
 	  else if (EQ (key, Q_keys))     keys       = val;
+	  else if (EQ (key, Q_key_sequence))  ; /* ignored for FSF compat */
+	  else if (EQ (key, Q_label))  ; /* implement for 21.0 */
 	  else if (EQ (key, Q_style))    style      = val;
 	  else if (EQ (key, Q_selected)) selected_p = val, selected_spec = 1;
 	  else if (EQ (key, Q_included)) include_p  = val, included_spec = 1;
--- a/version.sh	Mon Aug 13 10:48:18 2007 +0200
+++ b/version.sh	Mon Aug 13 10:48:41 2007 +0200
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=0
-emacs_beta_version=61
-xemacs_codename="Poitou61"
+emacs_beta_version=62
+xemacs_codename="Pyrenean"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=6