update from main archive 970417libc20x-970417glibc-2_0_4

26 files changed, 0 insertions, 1744 deletions

diff --git a/nt/_emacs b/nt/_emacs
deleted file mode 100644
index 76ef4e58c34..00000000000
--- a/nt/_emacs
+++ /dev/null
@@ -1,3 +0,0 @@
-;;; This is the user emacs startup file (.emacs in Unix land).
-
-(put 'eval-expression 'disabled nil)
diff --git a/nt/addpm.c b/nt/addpm.c
deleted file mode 100644
index 2138143ccd9..00000000000
--- a/nt/addpm.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Add entries to the GNU Emacs Program Manager folder.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs 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.
-
-GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/****************************************************************************
- *
- * Program: addpm	(adds emacs to the Windows program manager)
- *
- * Usage:
- *   	argv[1] = install path for emacs
- *	argv[2] = full path to icon for emacs (optional)
- */
-
-#include <windows.h>
-#include <ddeml.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-HDDEDATA CALLBACK 
-DdeCallback (UINT uType, UINT uFmt, HCONV hconv,
-	     HSZ hsz1, HSZ hsz2, HDDEDATA hdata,
-	     DWORD dwData1, DWORD dwData2)
-{
-  return ((HDDEDATA) NULL);
-}
-
-#define DdeCommand(str) 	\
-	DdeClientTransaction (str, strlen (str)+1, HConversation, (HSZ)NULL, \
-		              CF_TEXT, XTYP_EXECUTE, 30000, NULL)
-
-#define REG_ROOT "SOFTWARE\\GNU\\Emacs"
-
-static struct entry
-{
-  char *name;
-  char *value;
-} 
-env_vars[] = 
-{
-  {"emacs_dir", NULL},
-  {"EMACSLOADPATH", "%emacs_dir%/lisp;%emacs_dir%/site-lisp"},
-  {"SHELL", "%COMSPEC%"},
-  {"EMACSDATA", "%emacs_dir%/etc"},
-  {"EMACSPATH", "%emacs_dir%/bin"},
-  {"EMACSLOCKDIR", "%emacs_dir%/lock"},
-  {"INFOPATH", "%emacs_dir%/info"},
-  {"EMACSDOC", "%emacs_dir%/etc"},
-  {"TERM", "cmd"}
-};
-
-BOOL 
-add_registry (path)
-     char *path;
-{
-  HKEY hrootkey = NULL;
-  DWORD dwDisp;
-  int i;
-  BOOL ok = TRUE;
-  
-  /* Check both the current user and the local machine to see if we 
-     have any resources.  */
-  
-  if (RegCreateKeyEx (HKEY_LOCAL_MACHINE, REG_ROOT,
-		      0, "", REG_OPTION_NON_VOLATILE,
-		      KEY_WRITE, NULL, &hrootkey, &dwDisp) != ERROR_SUCCESS 
-      && RegCreateKeyEx (HKEY_CURRENT_USER, REG_ROOT,
-			 0, "", REG_OPTION_NON_VOLATILE,
-			 KEY_WRITE, NULL, &hrootkey, &dwDisp) != ERROR_SUCCESS)
-    {
-      return FALSE;
-    }
-  
-  for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++) 
-    {
-      char * value = env_vars[i].value ? env_vars[i].value : path;
-	
-      if (RegSetValueEx (hrootkey, env_vars[i].name,
-			 0, REG_EXPAND_SZ,
-			 value, lstrlen (value) + 1) != ERROR_SUCCESS)
-	ok = FALSE;
-    }			      
-  
-  RegCloseKey (hrootkey);
-  
-  return (ok);
-}
-
-int
-main (argc, argv)
-     int argc;
-     char *argv[];			
-{
-  DWORD idDde;
-  HCONV HConversation;
-  HSZ ProgMan;
-  char additem[MAX_PATH*2 + 100];
-  char *lpext;
-
-  if (argc < 2 || argc > 3)
-    {
-      fprintf (stderr, "usage: addpm emacs_path [icon_path]\n");
-      exit (1);
-    }
-
-  lpext = add_registry (argv[1]) ? "exe" : "bat";
-
-  DdeInitialize (&idDde, (PFNCALLBACK)DdeCallback, APPCMD_CLIENTONLY, 0);
-
-  ProgMan = DdeCreateStringHandle (idDde, "PROGMAN", CP_WINANSI);
-
-  if (HConversation = DdeConnect (idDde, ProgMan, ProgMan, NULL))
-    {
-      DdeCommand ("[CreateGroup (Gnu Emacs)]");
-      DdeCommand ("[ReplaceItem (Emacs)]");
-      sprintf (additem, "[AddItem (%s\\bin\\runemacs.%s, Emacs%c%s)]",
-	       argv[1], lpext, (argc>2 ? ',' : ' '),
-	       (argc>2 ? argv[2] : ""));
-      DdeCommand (additem);
-
-      DdeDisconnect (HConversation);
-    }
-
-  DdeFreeStringHandle (idDde, ProgMan);
-
-  DdeUninitialize (idDde);
-
-  return (0);
-}
diff --git a/nt/config.nt b/nt/config.nt
deleted file mode 100644
index 6a59cdc1ba6..00000000000
--- a/nt/config.nt
+++ /dev/null
@@ -1,349 +0,0 @@
-/* GNU Emacs site configuration template file.  -*- C -*-
-   Copyright (C) 1988, 1993, 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs 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.
-
-GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-
-/* No code in Emacs #includes config.h twice, but some of the code
-   intended to work with other packages as well (like gmalloc.c) 
-   think they can include it as many times as they like.  */
-#ifndef EMACS_CONFIG_H
-#define EMACS_CONFIG_H
-
-
-/* These are all defined in the top-level Makefile by configure.
-   They're here only for reference.  */
-
-/* Define LISP_FLOAT_TYPE if you want emacs to support floating-point
-   numbers. */
-#undef LISP_FLOAT_TYPE
-
-/* Define GNU_MALLOC if you want to use the *new* GNU memory allocator. */
-#undef GNU_MALLOC
-
-/* Define REL_ALLOC if you want to use the relocating allocator for
-   buffer space. */
-#undef REL_ALLOC
-  
-/* Define HAVE_X_WINDOWS if you want to use the X window system.  */
-#undef HAVE_X_WINDOWS
-
-/* Define HAVE_X11 if you want to use version 11 of X windows.
-   Otherwise, Emacs expects to use version 10.  */
-#undef HAVE_X11
-
-/* Define if using an X toolkit.  */
-#undef USE_X_TOOLKIT
-
-/* Define this if you're using XFree386.  */
-#undef HAVE_XFREE386
-
-/* Define HAVE_X_MENU if you want to use the X window menu system.
-   This appears to work on some machines that support X
-   and not on others.  */
-#undef HAVE_X_MENU
-
-/* Define if we have the X11R6 or newer version of Xt.  */
-#undef HAVE_X11XTR6
-
-/* Define if netdb.h declares h_errno.  */
-#undef HAVE_H_ERRNO
-
-/* Nowadays we have frame objects even if we support only ASCII terminals.  */
-#define MULTI_FRAME
-
-/* If we're using any sort of window system, define some consequences.  */
-#ifdef HAVE_X_WINDOWS
-#define HAVE_WINDOW_SYSTEM
-#define MULTI_KBOARD
-#define HAVE_FACES
-#define HAVE_MOUSE
-#endif
-
-/* Define USE_TEXT_PROPERTIES to support visual and other properties
-   on text. */
-#define USE_TEXT_PROPERTIES
-
-/* Define USER_FULL_NAME to return a string
-   that is the user's full name.
-   It can assume that the variable `pw'
-   points to the password file entry for this user.
-
-   At some sites, the pw_gecos field contains
-   the user's full name.  If neither this nor any other
-   field contains the right thing, use pw_name,
-   giving the user's login name, since that is better than nothing.  */
-#define USER_FULL_NAME pw->pw_gecos
-
-/* Define AMPERSAND_FULL_NAME if you use the convention
-   that & in the full name stands for the login id.  */
-#undef AMPERSAND_FULL_NAME
-
-/* Things set by --with options in the configure script.  */
-
-/* Define to support POP mail retrieval.  */
-#undef MAIL_USE_POP
-
-/* Define to support Kerberos-authenticated POP mail retrieval.  */
-#undef KERBEROS
-
-/* Define to support using a Hesiod database to find the POP server.  */
-#undef HESIOD
-
-/* Some things figured out by the configure script, grouped as they are in
-   configure.in.  */
-#ifndef _ALL_SOURCE  /* suppress warning if this is pre-defined */
-#undef _ALL_SOURCE
-#endif
-#undef HAVE_SYS_SELECT_H
-#undef HAVE_SYS_TIMEB_H
-#undef HAVE_SYS_TIME_H
-#undef HAVE_UNISTD_H
-#undef HAVE_UTIME_H
-#undef STDC_HEADERS
-#undef TIME_WITH_SYS_TIME
-
-#undef HAVE_LIBDNET
-#undef HAVE_LIBPTHREADS
-#undef HAVE_LIBRESOLV
-
-#undef HAVE_ALLOCA_H
-
-#undef HAVE_GETTIMEOFDAY
-#undef GETTIMEOFDAY_ONE_ARGUMENT
-#undef HAVE_GETHOSTNAME
-#undef HAVE_DUP2
-#undef HAVE_RENAME
-#undef HAVE_CLOSEDIR
-
-#undef TM_IN_SYS_TIME
-#undef HAVE_TM_ZONE
-#undef HAVE_TZNAME
-
-#undef const
-
-#undef HAVE_LONG_FILE_NAMES
-
-#undef CRAY_STACKSEG_END
-
-#undef UNEXEC_SRC
-
-#undef HAVE_LIBXBSD
-#undef HAVE_XRMSETDATABASE
-#undef HAVE_XSCREENRESOURCESTRING
-#undef HAVE_XSCREENNUMBEROFSCREEN
-#undef HAVE_XSETWMPROTOCOLS
-
-#undef HAVE_MKDIR
-#undef HAVE_RMDIR
-#undef HAVE_RANDOM
-#undef HAVE_LRAND48
-#undef HAVE_BCOPY
-#undef HAVE_BCMP
-#undef HAVE_LOGB
-#undef HAVE_FREXP
-#undef HAVE_FMOD
-#undef HAVE_FTIME
-#undef HAVE_RES_INIT /* For -lresolv on Suns.  */
-#undef HAVE_SETSID
-#undef HAVE_FPATHCONF
-#undef HAVE_SELECT
-#undef HAVE_MKTIME
-#undef HAVE_EACCESS
-#undef HAVE_GETPAGESIZE
-#undef HAVE_INET_SOCKETS
-
-#undef HAVE_AIX_SMT_EXP
-
-/* Define if you have the ANSI `strerror' function.
-   Otherwise you must have the variable `char *sys_errlist[]'.  */
-#undef HAVE_STRERROR
-
-#undef HAVE_UTIMES
-
-/* Define if `sys_siglist' is declared by <signal.h>.  */
-#undef SYS_SIGLIST_DECLARED
-
-/* Define if `struct utimbuf' is declared by <utime.h>.  */
-#undef HAVE_STRUCT_UTIMBUF
-
-/* Define if `struct timeval' is declared by <sys/time.h>.  */
-#undef HAVE_TIMEVAL
-
-/* If using GNU, then support inline function declarations. */
-#ifdef __GNUC__
-#define INLINE __inline__
-#else
-#define INLINE
-#endif
-
-#undef EMACS_CONFIGURATION
-
-#undef EMACS_CONFIG_OPTIONS
-
-/* The configuration script defines opsysfile to be the name of the
-   s/SYSTEM.h file that describes the system type you are using.  The file
-   is chosen based on the configuration name you give.
-
-   See the file ../etc/MACHINES for a list of systems and the
-   configuration names to use for them.
-
-   See s/template.h for documentation on writing s/SYSTEM.h files.  */
-#undef config_opsysfile 
-#include "s/ms-w32.h"
-
-/* The configuration script defines machfile to be the name of the
-   m/MACHINE.h file that describes the machine you are using.  The file is
-   chosen based on the configuration name you give.
-
-   See the file ../etc/MACHINES for a list of machines and the
-   configuration names to use for them.
-
-   See m/template.h for documentation on writing m/MACHINE.h files.  */
-#undef config_machfile
-#include "m/intel386.h"
-
-/* These typedefs shouldn't appear when alloca.s or Makefile.in
-   includes config.h.  */
-#ifndef NOT_C_CODE
-#ifndef SPECIAL_EMACS_INT
-typedef long EMACS_INT;
-typedef unsigned long EMACS_UINT;
-#endif
-#endif
-
-/* Load in the conversion definitions if this system
-   needs them and the source file being compiled has not
-   said to inhibit this.  There should be no need for you
-   to alter these lines.  */
-
-#ifdef SHORTNAMES
-#ifndef NO_SHORTNAMES
-#include "../shortnames/remap.h"
-#endif /* not NO_SHORTNAMES */
-#endif /* SHORTNAMES */
-
-/* If no remapping takes place, static variables cannot be dumped as
-   pure, so don't worry about the `static' keyword. */
-#ifdef NO_REMAP
-#undef static
-#endif
-
-/* Define `subprocesses' should be defined if you want to
-   have code for asynchronous subprocesses
-   (as used in M-x compile and M-x shell).
-   These do not work for some USG systems yet;
-   for the ones where they work, the s/SYSTEM.h file defines this flag.  */
-
-#ifndef VMS
-#ifndef USG
-/* #define subprocesses */
-#endif
-#endif
-
-/* Define LD_SWITCH_SITE to contain any special flags your loader may need.  */
-#undef LD_SWITCH_SITE
-
-/* Define C_SWITCH_SITE to contain any special flags your compiler needs.  */
-#undef C_SWITCH_SITE
-
-/* Define LD_SWITCH_X_SITE to contain any special flags your loader
-   may need to deal with X Windows.  For instance, if you've defined
-   HAVE_X_WINDOWS above and your X libraries aren't in a place that
-   your loader can find on its own, you might want to add "-L/..." or
-   something similar.  */
-#undef LD_SWITCH_X_SITE
-
-/* Define LD_SWITCH_X_SITE_AUX with an -R option
-   in case it's needed (for Solaris, for example).  */
-#undef LD_SWITCH_X_SITE_AUX
-
-/* Define C_SWITCH_X_SITE to contain any special flags your compiler
-   may need to deal with X Windows.  For instance, if you've defined
-   HAVE_X_WINDOWS above and your X include files aren't in a place
-   that your compiler can find on its own, you might want to add
-   "-I/..." or something similar.  */
-#undef C_SWITCH_X_SITE
-
-/* Define STACK_DIRECTION here, but not if m/foo.h did.  */
-#ifndef STACK_DIRECTION
-#undef STACK_DIRECTION
-#endif
-
-/* Define the return type of signal handlers if the s-xxx file
-   did not already do so.  */
-#define RETSIGTYPE void
-
-/* SIGTYPE is the macro we actually use.  */
-#ifndef SIGTYPE
-#define SIGTYPE RETSIGTYPE
-#endif
-
-#ifdef emacs /* Don't do this for lib-src.  */
-/* Tell regex.c to use a type compatible with Emacs.  */
-#define RE_TRANSLATE_TYPE Lisp_Object *
-#endif
-
-/* The rest of the code currently tests the CPP symbol BSTRING.
-   Override any claims made by the system-description files.
-   Note that on some SCO version it is possible to have bcopy and not bcmp.  */
-#undef BSTRING
-#if defined (HAVE_BCOPY) && defined (HAVE_BCMP)
-#define BSTRING
-#endif
-
-/* Non-ANSI C compilers usually don't have volatile.  */
-#ifndef HAVE_VOLATILE
-#ifndef __STDC__
-#define volatile
-#endif
-#endif
-
-/* Some of the files of Emacs which are intended for use with other
-   programs assume that if you have a config.h file, you must declare
-   the type of getenv.
-
-   This declaration shouldn't appear when alloca.s or Makefile.in
-   includes config.h.  */
-#ifndef NOT_C_CODE
-extern char *getenv ();
-#endif
-
-#endif /* EMACS_CONFIG_H */
-
-/* These default definitions are good for almost all machines.
-   The exceptions override them in m/*.h.  */
-
-#ifndef BITS_PER_CHAR
-#define BITS_PER_CHAR 8
-#endif
-
-#ifndef BITS_PER_SHORT
-#define BITS_PER_SHORT 16
-#endif
-
-/* Note that lisp.h uses this in a preprocessor conditional, so it
-   would not work to use sizeof.  That being so, we do all of them
-   without sizeof, for uniformity's sake.  */
-#ifndef BITS_PER_INT
-#define BITS_PER_INT 32
-#endif
-
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG 32
-#endif
diff --git a/nt/config.w95 b/nt/config.w95
deleted file mode 100644
index bcba3475925..00000000000
--- a/nt/config.w95
+++ /dev/null
@@ -1,349 +0,0 @@
-/* GNU Emacs site configuration template file.  -*- C -*-
-   Copyright (C) 1988, 1993, 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs 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.
-
-GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-
-/* No code in Emacs #includes config.h twice, but some of the code
-   intended to work with other packages as well (like gmalloc.c) 
-   think they can include it as many times as they like.  */
-#ifndef EMACS_CONFIG_H
-#define EMACS_CONFIG_H
-
-
-/* These are all defined in the top-level Makefile by configure.
-   They're here only for reference.  */
-
-/* Define LISP_FLOAT_TYPE if you want emacs to support floating-point
-   numbers. */
-#undef LISP_FLOAT_TYPE
-
-/* Define GNU_MALLOC if you want to use the *new* GNU memory allocator. */
-#undef GNU_MALLOC
-
-/* Define REL_ALLOC if you want to use the relocating allocator for
-   buffer space. */
-#undef REL_ALLOC
-  
-/* Define HAVE_X_WINDOWS if you want to use the X window system.  */
-#undef HAVE_X_WINDOWS
-
-/* Define HAVE_X11 if you want to use version 11 of X windows.
-   Otherwise, Emacs expects to use version 10.  */
-#undef HAVE_X11
-
-/* Define if using an X toolkit.  */
-#undef USE_X_TOOLKIT
-
-/* Define this if you're using XFree386.  */
-#undef HAVE_XFREE386
-
-/* Define HAVE_X_MENU if you want to use the X window menu system.
-   This appears to work on some machines that support X
-   and not on others.  */
-#undef HAVE_X_MENU
-
-/* Define if we have the X11R6 or newer version of Xt.  */
-#undef HAVE_X11XTR6
-
-/* Define if netdb.h declares h_errno.  */
-#undef HAVE_H_ERRNO
-
-/* Nowadays we have frame objects even if we support only ASCII terminals.  */
-#define MULTI_FRAME
-
-/* If we're using any sort of window system, define some consequences.  */
-#ifdef HAVE_X_WINDOWS
-#define HAVE_WINDOW_SYSTEM
-#define MULTI_KBOARD
-#define HAVE_FACES
-#define HAVE_MOUSE
-#endif
-
-/* Define USE_TEXT_PROPERTIES to support visual and other properties
-   on text. */
-#define USE_TEXT_PROPERTIES
-
-/* Define USER_FULL_NAME to return a string
-   that is the user's full name.
-   It can assume that the variable `pw'
-   points to the password file entry for this user.
-
-   At some sites, the pw_gecos field contains
-   the user's full name.  If neither this nor any other
-   field contains the right thing, use pw_name,
-   giving the user's login name, since that is better than nothing.  */
-#define USER_FULL_NAME pw->pw_gecos
-
-/* Define AMPERSAND_FULL_NAME if you use the convention
-   that & in the full name stands for the login id.  */
-#undef AMPERSAND_FULL_NAME
-
-/* Things set by --with options in the configure script.  */
-
-/* Define to support POP mail retrieval.  */
-#undef MAIL_USE_POP
-
-/* Define to support Kerberos-authenticated POP mail retrieval.  */
-#undef KERBEROS
-
-/* Define to support using a Hesiod database to find the POP server.  */
-#undef HESIOD
-
-/* Some things figured out by the configure script, grouped as they are in
-   configure.in.  */
-#ifndef _ALL_SOURCE  /* suppress warning if this is pre-defined */
-#undef _ALL_SOURCE
-#endif
-#undef HAVE_SYS_SELECT_H
-#undef HAVE_SYS_TIMEB_H
-#undef HAVE_SYS_TIME_H
-#undef HAVE_UNISTD_H
-#undef HAVE_UTIME_H
-#undef STDC_HEADERS
-#undef TIME_WITH_SYS_TIME
-
-#undef HAVE_LIBDNET
-#undef HAVE_LIBPTHREADS
-#undef HAVE_LIBRESOLV
-
-#undef HAVE_ALLOCA_H
-
-#undef HAVE_GETTIMEOFDAY
-#undef GETTIMEOFDAY_ONE_ARGUMENT
-#undef HAVE_GETHOSTNAME
-#undef HAVE_DUP2
-#undef HAVE_RENAME
-#undef HAVE_CLOSEDIR
-
-#undef TM_IN_SYS_TIME
-#undef HAVE_TM_ZONE
-#undef HAVE_TZNAME
-
-#undef const
-
-#undef HAVE_LONG_FILE_NAMES
-
-#undef CRAY_STACKSEG_END
-
-#undef UNEXEC_SRC
-
-#undef HAVE_LIBXBSD
-#undef HAVE_XRMSETDATABASE
-#undef HAVE_XSCREENRESOURCESTRING
-#undef HAVE_XSCREENNUMBEROFSCREEN
-#undef HAVE_XSETWMPROTOCOLS
-
-#undef HAVE_MKDIR
-#undef HAVE_RMDIR
-#undef HAVE_RANDOM
-#undef HAVE_LRAND48
-#undef HAVE_BCOPY
-#undef HAVE_BCMP
-#undef HAVE_LOGB
-#undef HAVE_FREXP
-#undef HAVE_FMOD
-#undef HAVE_FTIME
-#undef HAVE_RES_INIT /* For -lresolv on Suns.  */
-#undef HAVE_SETSID
-#undef HAVE_FPATHCONF
-#undef HAVE_SELECT
-#undef HAVE_MKTIME
-#undef HAVE_EACCESS
-#undef HAVE_GETPAGESIZE
-#undef HAVE_INET_SOCKETS
-
-#undef HAVE_AIX_SMT_EXP
-
-/* Define if you have the ANSI `strerror' function.
-   Otherwise you must have the variable `char *sys_errlist[]'.  */
-#undef HAVE_STRERROR
-
-#undef HAVE_UTIMES
-
-/* Define if `sys_siglist' is declared by <signal.h>.  */
-#undef SYS_SIGLIST_DECLARED
-
-/* Define if `struct utimbuf' is declared by <utime.h>.  */
-#undef HAVE_STRUCT_UTIMBUF
-
-/* Define if `struct timeval' is declared by <sys/time.h>.  */
-#undef HAVE_TIMEVAL
-
-/* If using GNU, then support inline function declarations. */
-#ifdef __GNUC__
-#define INLINE __inline__
-#else
-#define INLINE
-#endif
-
-#undef EMACS_CONFIGURATION
-
-#undef EMACS_CONFIG_OPTIONS
-
-/* The configuration script defines opsysfile to be the name of the
-   s/SYSTEM.h file that describes the system type you are using.  The file
-   is chosen based on the configuration name you give.
-
-   See the file ../etc/MACHINES for a list of systems and the
-   configuration names to use for them.
-
-   See s/template.h for documentation on writing s/SYSTEM.h files.  */
-#undef config_opsysfile 
-#include "s/windows95.h"
-
-/* The configuration script defines machfile to be the name of the
-   m/MACHINE.h file that describes the machine you are using.  The file is
-   chosen based on the configuration name you give.
-
-   See the file ../etc/MACHINES for a list of machines and the
-   configuration names to use for them.
-
-   See m/template.h for documentation on writing m/MACHINE.h files.  */
-#undef config_machfile
-#include "m/intel386.h"
-
-/* These typedefs shouldn't appear when alloca.s or Makefile.in
-   includes config.h.  */
-#ifndef NOT_C_CODE
-#ifndef SPECIAL_EMACS_INT
-typedef long EMACS_INT;
-typedef unsigned long EMACS_UINT;
-#endif
-#endif
-
-/* Load in the conversion definitions if this system
-   needs them and the source file being compiled has not
-   said to inhibit this.  There should be no need for you
-   to alter these lines.  */
-
-#ifdef SHORTNAMES
-#ifndef NO_SHORTNAMES
-#include "../shortnames/remap.h"
-#endif /* not NO_SHORTNAMES */
-#endif /* SHORTNAMES */
-
-/* If no remapping takes place, static variables cannot be dumped as
-   pure, so don't worry about the `static' keyword. */
-#ifdef NO_REMAP
-#undef static
-#endif
-
-/* Define `subprocesses' should be defined if you want to
-   have code for asynchronous subprocesses
-   (as used in M-x compile and M-x shell).
-   These do not work for some USG systems yet;
-   for the ones where they work, the s/SYSTEM.h file defines this flag.  */
-
-#ifndef VMS
-#ifndef USG
-/* #define subprocesses */
-#endif
-#endif
-
-/* Define LD_SWITCH_SITE to contain any special flags your loader may need.  */
-#undef LD_SWITCH_SITE
-
-/* Define C_SWITCH_SITE to contain any special flags your compiler needs.  */
-#undef C_SWITCH_SITE
-
-/* Define LD_SWITCH_X_SITE to contain any special flags your loader
-   may need to deal with X Windows.  For instance, if you've defined
-   HAVE_X_WINDOWS above and your X libraries aren't in a place that
-   your loader can find on its own, you might want to add "-L/..." or
-   something similar.  */
-#undef LD_SWITCH_X_SITE
-
-/* Define LD_SWITCH_X_SITE_AUX with an -R option
-   in case it's needed (for Solaris, for example).  */
-#undef LD_SWITCH_X_SITE_AUX
-
-/* Define C_SWITCH_X_SITE to contain any special flags your compiler
-   may need to deal with X Windows.  For instance, if you've defined
-   HAVE_X_WINDOWS above and your X include files aren't in a place
-   that your compiler can find on its own, you might want to add
-   "-I/..." or something similar.  */
-#undef C_SWITCH_X_SITE
-
-/* Define STACK_DIRECTION here, but not if m/foo.h did.  */
-#ifndef STACK_DIRECTION
-#undef STACK_DIRECTION
-#endif
-
-/* Define the return type of signal handlers if the s-xxx file
-   did not already do so.  */
-#define RETSIGTYPE void
-
-/* SIGTYPE is the macro we actually use.  */
-#ifndef SIGTYPE
-#define SIGTYPE RETSIGTYPE
-#endif
-
-#ifdef emacs /* Don't do this for lib-src.  */
-/* Tell regex.c to use a type compatible with Emacs.  */
-#define RE_TRANSLATE_TYPE Lisp_Object *
-#endif
-
-/* The rest of the code currently tests the CPP symbol BSTRING.
-   Override any claims made by the system-description files.
-   Note that on some SCO version it is possible to have bcopy and not bcmp.  */
-#undef BSTRING
-#if defined (HAVE_BCOPY) && defined (HAVE_BCMP)
-#define BSTRING
-#endif
-
-/* Non-ANSI C compilers usually don't have volatile.  */
-#ifndef HAVE_VOLATILE
-#ifndef __STDC__
-#define volatile
-#endif
-#endif
-
-/* Some of the files of Emacs which are intended for use with other
-   programs assume that if you have a config.h file, you must declare
-   the type of getenv.
-
-   This declaration shouldn't appear when alloca.s or Makefile.in
-   includes config.h.  */
-#ifndef NOT_C_CODE
-extern char *getenv ();
-#endif
-
-#endif /* EMACS_CONFIG_H */
-
-/* These default definitions are good for almost all machines.
-   The exceptions override them in m/*.h.  */
-
-#ifndef BITS_PER_CHAR
-#define BITS_PER_CHAR 8
-#endif
-
-#ifndef BITS_PER_SHORT
-#define BITS_PER_SHORT 16
-#endif
-
-/* Note that lisp.h uses this in a preprocessor conditional, so it
-   would not work to use sizeof.  That being so, we do all of them
-   without sizeof, for uniformity's sake.  */
-#ifndef BITS_PER_INT
-#define BITS_PER_INT 32
-#endif
-
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG 32
-#endif
diff --git a/nt/ebuild.bat b/nt/ebuild.bat
deleted file mode 100755
index 32cea5af9fa..00000000000
--- a/nt/ebuild.bat
+++ /dev/null
@@ -1 +0,0 @@
-nmake -f makefile.nt all

diff --git a/nt/emacs.bat b/nt/emacs.bat
deleted file mode 100755
index 14e4893d6df..00000000000
--- a/nt/emacs.bat
+++ /dev/null
@@ -1,44 +0,0 @@
-@echo off

-

-REM Change this to the directory into which you installed Emacs:

-set emacs_path=C:\emacs

-

-REM

-REM You shouldn't have to change any of the below.

-REM

-

-REM Set OS specific values.

-set ARCH_SAVE=%PROCESSOR_ARCHITECTURE%

-set PROCESSOR_ARCHITECTURE=

-if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto win95

-set PROCESSOR_ARCHITECTURE=%ARCH_SAVE%

-set SHELL=cmd

-goto next

-

-:win95

-set SHELL=command

-

-:next

-

-set EMACSLOADPATH=%emacs_path%\lisp

-set EMACSDATA=%emacs_path%\etc

-set EMACSPATH=%emacs_path%\bin

-set EMACSLOCKDIR=%emacs_path%\lock

-set INFOPATH=%emacs_path%\info

-set EMACSDOC=%emacs_path%\etc

-set TERM=CMD

-

-REM The variable HOME is used to find the startup file, ~\_emacs.  Ideally,

-REM this will not be set in this file but should already be set before

-REM this file is invoked.  If HOME is not set, use some generic default.

-

-set HOME_SAVE=%HOME%

-set HOME_EXISTS=yes

-set HOME_DEFAULT=C:\

-set HOME=

-if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no

-if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE%

-if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT%

-if "%HOME_EXISTS%" == "no" echo HOME is not set!  Using %HOME% as a default...

-

-%emacs_path%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9

diff --git a/nt/emacs.bat.in b/nt/emacs.bat.in
deleted file mode 100644
index 0e594160fd8..00000000000
--- a/nt/emacs.bat.in
+++ /dev/null
@@ -1,38 +0,0 @@
-

-REM Here begins emacs.bat.in

-

-REM Set OS specific values.

-set ARCH_SAVE=%PROCESSOR_ARCHITECTURE%

-set PROCESSOR_ARCHITECTURE=

-if "%ARCH_SAVE%" == "%PROCESSOR_ARCHITECTURE%" goto win95

-set PROCESSOR_ARCHITECTURE=%ARCH_SAVE%

-set SHELL=cmd

-goto next

-

-:win95

-set SHELL=command

-

-:next

-

-set EMACSLOADPATH=%emacs_dir%\lisp;%emacs_dir%\site-lisp

-set EMACSDATA=%emacs_dir%\etc

-set EMACSPATH=%emacs_dir%\bin

-set EMACSLOCKDIR=%emacs_dir%\lock

-set INFOPATH=%emacs_dir%\info

-set EMACSDOC=%emacs_dir%\etc

-set TERM=CMD

-

-REM The variable HOME is used to find the startup file, ~\_emacs.  Ideally,

-REM this will not be set in this file but should already be set before

-REM this file is invoked.  If HOME is not set, use some generic default.

-

-set HOME_SAVE=%HOME%

-set HOME_EXISTS=yes

-set HOME_DEFAULT=C:\

-set HOME=

-if "%HOME%" == "%HOME_SAVE%" set HOME_EXISTS=no

-if "%HOME_EXISTS%" == "yes" set HOME=%HOME_SAVE%

-if "%HOME_EXISTS%" == "no" set HOME=%HOME_DEFAULT%

-if "%HOME_EXISTS%" == "no" echo HOME is not set!  Using %HOME% as a default...

-

-%emacs_dir%\bin\emacs.exe %1 %2 %3 %4 %5 %6 %7 %8 %9

diff --git a/nt/emacs.rc b/nt/emacs.rc
deleted file mode 100644
index 3c81f0aa403..00000000000
--- a/nt/emacs.rc
+++ /dev/null
@@ -1 +0,0 @@
-Emacs ICON    emacs.ico
diff --git a/nt/fast-install.bat b/nt/fast-install.bat
deleted file mode 100755
index 157c4ab8751..00000000000
--- a/nt/fast-install.bat
+++ /dev/null
@@ -1 +0,0 @@
-nmake -f makefile.nt fast_install

diff --git a/nt/inc/arpa/inet.h b/nt/inc/arpa/inet.h
deleted file mode 100644
index f5d197c06e1..00000000000
--- a/nt/inc/arpa/inet.h
+++ /dev/null
@@ -1 +0,0 @@
-/* null version of <arpa/inet.h> - <sys/socket.h> has everything */
diff --git a/nt/inc/netdb.h b/nt/inc/netdb.h
deleted file mode 100644
index 5bf232e7f5c..00000000000
--- a/nt/inc/netdb.h
+++ /dev/null
@@ -1 +0,0 @@
-/* null version of <netdb.h> - <sys/socket.h> has everything */
diff --git a/nt/inc/netinet/in.h b/nt/inc/netinet/in.h
deleted file mode 100644
index 46fb0faccea..00000000000
--- a/nt/inc/netinet/in.h
+++ /dev/null
@@ -1 +0,0 @@
-/* null version of <netinet/in.h> - <sys/socket.h> has everything */
diff --git a/nt/inc/pwd.h b/nt/inc/pwd.h
deleted file mode 100644
index 6202ccd1e75..00000000000
--- a/nt/inc/pwd.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _PWD_H_
-#define _PWD_H_
-/*
- * pwd.h doesn't exist on NT, so we put together our own.
- */
-
-struct passwd {
-    char *pw_name;
-    char *pw_passwd;
-    int   pw_uid;
-    int   pw_gid;
-    int   pw_quota;
-    char *pw_gecos;
-    char *pw_dir;
-    char *pw_shell;
-};
-
-#endif /* _PWD_H_ */
diff --git a/nt/inc/sys/dir.h b/nt/inc/sys/dir.h
deleted file mode 100644
index 203e27f2fe7..00000000000
--- a/nt/inc/sys/dir.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * map sys\dir.h to ..\..\..\src\ndir.h
- */
-
-#include "..\..\..\src\ndir.h"
diff --git a/nt/inc/sys/file.h b/nt/inc/sys/file.h
deleted file mode 100644
index 8536d0362f1..00000000000
--- a/nt/inc/sys/file.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * sys\file.h doesn't exist on NT - only needed for these constants
- */
-
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
diff --git a/nt/inc/sys/ioctl.h b/nt/inc/sys/ioctl.h
deleted file mode 100644
index dc0957873da..00000000000
--- a/nt/inc/sys/ioctl.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * sys\ioctl.h doesn't exist on NT...rather than including it conditionally
- * in many of the source files, we just extend the include path so that the
- * compiler will pick this up empty header instead.
- */
diff --git a/nt/inc/sys/param.h b/nt/inc/sys/param.h
deleted file mode 100644
index 397c5ffae66..00000000000
--- a/nt/inc/sys/param.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _PARAM_H_
-#define _PARAM_H_
-
-/*
- * sys\param.h doesn't exist on NT, so we'll make one.
- */
-
-#define NBPG 4096
-
-#endif /* _PARAM_H_ */
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
deleted file mode 100644
index a8f00f83502..00000000000
--- a/nt/inc/sys/socket.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Workable version of <sys/socket.h> based on winsock.h */
-
-#ifndef _SOCKET_H_
-#define _SOCKET_H_
-
-/* defeat the multiple include protection */
-#ifdef _WINSOCKAPI_
-#undef _WINSOCKAPI_
-#endif
-
-/* avoid confusion with our version of select */
-#ifdef select
-#undef select
-#define MUST_REDEF_SELECT
-#endif
-
-/* avoid clashing with our version of FD_SET if already defined */
-#ifdef FD_SET
-#undef FD_SET
-#undef FD_CLR
-#undef FD_ISSET
-#undef FD_ZERO
-#endif
-
-/* allow us to provide our own version of fd_set */
-#define fd_set ws_fd_set
-
-/* avoid duplicate definition of timeval */
-#ifdef HAVE_TIMEVAL
-#define timeval ws_timeval
-#endif
-
-#include <winsock.h>
-
-/* redefine select to reference our version */
-#ifdef MUST_REDEF_SELECT
-#define select sys_select
-#undef MUST_REDEF_SELECT
-#endif
-
-/* revert to our version of FD_SET */
-#undef FD_SET
-#undef FD_CLR
-#undef FD_ISSET
-#undef FD_ZERO
-#undef fd_set
-#include "w32.h"
-
-#ifdef HAVE_TIMEVAL
-#undef timeval
-#endif
-
-/* shadow functions where we provide our own wrapper */
-#define socket         sys_socket
-#define bind           sys_bind
-#define connect        sys_connect
-#define htons          sys_htons
-#define ntohs          sys_ntohs
-#define inet_addr      sys_inet_addr
-#define gethostname    sys_gethostname
-#define gethostbyname  sys_gethostbyname
-#define getservbyname  sys_getservbyname
-
-int sys_socket(int af, int type, int protocol);
-int sys_bind (int s, const struct sockaddr *addr, int namelen);
-int sys_connect (int s, const struct sockaddr *addr, int namelen);
-u_short sys_htons (u_short hostshort);
-u_short sys_ntohs (u_short netshort);
-unsigned long sys_inet_addr (const char * cp);
-int sys_gethostname (char * name, int namelen);
-struct hostent * sys_gethostbyname(const char * name);
-struct servent * sys_getservbyname(const char * name, const char * proto);
-
-/* we are providing a real h_errno variable */
-#undef h_errno
-extern int h_errno;
-
-/* map winsock error codes to standard names */
-#define EWOULDBLOCK             WSAEWOULDBLOCK
-#define EINPROGRESS             WSAEINPROGRESS
-#define EALREADY                WSAEALREADY
-#define ENOTSOCK                WSAENOTSOCK
-#define EDESTADDRREQ            WSAEDESTADDRREQ
-#define EMSGSIZE                WSAEMSGSIZE
-#define EPROTOTYPE              WSAEPROTOTYPE
-#define ENOPROTOOPT             WSAENOPROTOOPT
-#define EPROTONOSUPPORT         WSAEPROTONOSUPPORT
-#define ESOCKTNOSUPPORT         WSAESOCKTNOSUPPORT
-#define EOPNOTSUPP              WSAEOPNOTSUPP
-#define EPFNOSUPPORT            WSAEPFNOSUPPORT
-#define EAFNOSUPPORT            WSAEAFNOSUPPORT
-#define EADDRINUSE              WSAEADDRINUSE
-#define EADDRNOTAVAIL           WSAEADDRNOTAVAIL
-#define ENETDOWN                WSAENETDOWN
-#define ENETUNREACH             WSAENETUNREACH
-#define ENETRESET               WSAENETRESET
-#define ECONNABORTED            WSAECONNABORTED
-#define ECONNRESET              WSAECONNRESET
-#define ENOBUFS                 WSAENOBUFS
-#define EISCONN                 WSAEISCONN
-#define ENOTCONN                WSAENOTCONN
-#define ESHUTDOWN               WSAESHUTDOWN
-#define ETOOMANYREFS            WSAETOOMANYREFS
-#define ETIMEDOUT               WSAETIMEDOUT
-#define ECONNREFUSED            WSAECONNREFUSED
-#define ELOOP                   WSAELOOP
-/* #define ENAMETOOLONG            WSAENAMETOOLONG */
-#define EHOSTDOWN               WSAEHOSTDOWN
-#define EHOSTUNREACH            WSAEHOSTUNREACH
-/* #define ENOTEMPTY               WSAENOTEMPTY */
-#define EPROCLIM                WSAEPROCLIM
-#define EUSERS                  WSAEUSERS
-#define EDQUOT                  WSAEDQUOT
-#define ESTALE                  WSAESTALE
-#define EREMOTE                 WSAEREMOTE
-
-#endif /* _SOCKET_H_ */
-
-/* end of socket.h */
diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
deleted file mode 100644
index dc270998609..00000000000
--- a/nt/inc/sys/time.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * sys/time.h doesn't exist on NT
- */
-
-struct timeval 
-  {
-    long tv_sec;	/* seconds */
-    long tv_usec;	/* microseconds */
-  };
-struct timezone 
-  {
-    int	tz_minuteswest;	/* minutes west of Greenwich */
-    int	tz_dsttime;	/* type of dst correction */
-  };
-
-void gettimeofday (struct timeval *, struct timezone *);
-
-/* end of sys/time.h */
diff --git a/nt/inc/unistd.h b/nt/inc/unistd.h
deleted file mode 100644
index c1caa77a697..00000000000
--- a/nt/inc/unistd.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Fake unistd.h: config.h already provides most of the relevant things. */
diff --git a/nt/install b/nt/install
deleted file mode 100644
index d9fbfa343c1..00000000000
--- a/nt/install
+++ /dev/null
@@ -1,88 +0,0 @@
-		      Building and Installing Emacs
-		      on Windows NT and Windows 95
-
-You need a compiler package to build and install Emacs on NT or Win95.
-If you don't have one, precompiled versions are available in
-ftp://ftp.cs.washington.edu/pub/ntemacs/<version>.
-
-Configuring:
-
-(1) In previous versions, you needed to edit makefile.def
-    to reflect the compiler package that you are using.  You should no
-    longer have to do this if you have defined the INCLUDE and LIB 
-    environment variables, as is customary for use with Windows compilers.
-    (Unless you are using MSVCNT 1.1, in which case you will need
-    to set MSVCNT11 to be a non-zero value at the top of makefile.def.)
-
-(2) Choose the directory into which Emacs will be installed, and
-    edit makefile.def to define INSTALL_DIR to be this directory.  
-    (Alternatively, if you have INSTALL_DIR set as an environment
-    variable, the build process will ignore the value in makefile.def
-    and use the value of the environment variable instead.)  Note 
-    that if it is not installed in the directory in which it is built,
-    the ~16 MB of lisp files will be copied into the installation directory.
-
-    Also, makefile.def is sometimes unpacked read-only; use
-   
-    > attrib -r makefile.def
-
-    to make it writable.
-
-(3) You may need to edit nt/paths.h to specify some other device
-    instead of `C:'.
-
-Building:
-
-(4) The target to compile the sources is "all", and is recursive starting 
-    one directory up.  The makefiles for the NT port are in files named 
-    "makefile.nt".  To get things started, type in this directory:
-
-    > nmake -f makefile.nt all
-
-    or use the ebuild.bat file.
-
-    When the files are compiled, you will see some warning messages declaring
-    that some functions don't return a value, or that some data conversions
-    will be lossy, etc.  You can safely ignore these messages.  The warnings
-    may be fixed in the main FSF source at some point, but until then we
-    will just live with them.
-
-    NOTE: You should not have to edit src\paths.h to get Emacs to run
-    correctly.  All of the variables in src\paths.h are configured
-    during start up using the nt\emacs.bat file (which gets installed 
-    as bin\emacs.bat -- see below).
-
-Installing:
-
-(5) Currently, Emacs requires a number of environment variables to be set
-    for it to run correctly.  A batch file, emacs.bat, is provided that 
-    sets these variables appropriately and then runs the executable
-    (emacs.bat is generated using the definition of INSTALL_DIR in
-    nt\makefile.def and the contents of nt\emacs.bat.in).
-
-(6) The install process will install the files necessary to run Emacs in 
-    INSTALL_DIR (which may be the directory in which it was built), 
-    and create a program manager/folder icon in a folder called GNU Emacs.
-    From this directory, type:
-
-    > nmake -f makefile.nt install
-
-    or use the install.bat file.
-
-(7) Create the Emacs startup file.  Under Unix, this file is .emacs;
-    under NT and Win95, this files is _emacs.  (If you would like to
-    use a .emacs file that, for example, you share with a Unix version
-    of Emacs, you can invoke Emacs with the -l option to specify the
-    .emacs file that you would like to load.)  Note that Emacs requires 
-    the environment variable HOME to be set in order for it to locate the 
-    _emacs file.  Ideally, HOME should not be set in the emacs.bat file 
-    as it will be different for each user.  (HOME could be set, 
-    for example, in the System panel of the Control Panel).
-
-(8) Either click on the icon, or run the emacs.bat file, and away you go.
-
-    If you would like to resize the command window that Emacs uses,
-    or change the font or colors, click on the program manager icon
-    to start Emacs.  Change the settings using the "-" menu in the upper
-    left hand corner of the window, making sure to select the "Save"
-    options in the dialog boxes as you do so.  Exit Emacs and restart.
diff --git a/nt/install.bat b/nt/install.bat
deleted file mode 100755
index d506efe9d2f..00000000000
--- a/nt/install.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-if (%1) == (speed) set BUILD_TYPE=spd
-if (%1) == (speed) shift
-if not (%1) == () set INSTALL_DIR=%1
-nmake -f makefile.nt install
-set INSTALL_DIR=
-set BUILD_TYPE=
diff --git a/nt/makefile.def b/nt/makefile.def
deleted file mode 100644
index e83b0b71b07..00000000000
--- a/nt/makefile.def
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-#  Makefile definition file for building GNU Emacs on Windows NT
-#  
-#  GNU Emacs 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.
-#  
-#  GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#     Geoff Voelker (voelker@cs.washington.edu)         9-6-94
-
-#
-# BEGIN CONFIGURATION
-#
-
-# Define the following to build the GUI version
-#
-NTGUI=1
-
-# Set INSTALL_DIR to be the directory into which you want emacs installed.
-#
-!ifndef INSTALL_DIR
-INSTALL_DIR     = C:\emacs
-!endif
-
-# Define MSVCNT11 to be nonzero if you are using the MSVCNT 1.1 environment.
-# MSVCNT11	= 1
-MSVCNT11        = 0
-
-#
-# END CONFIGURATION
-#
-
-# Check that the INCLUDE and LIB environment variables are set.
-#
-!ifndef INCLUDE
-!error The INCLUDE environment variable needs to be set.
-!endif
-!ifndef LIB
-!error The LIB environment variable needs to be set.
-!endif
-
-# Determine the architecture we're running on.
-# Define ARCH for our purposes; 
-# Define CPU for use by ntwin32.mak;
-# Define CONFIG_H to the appropriate config.h for the system;
-#
-!ifdef PROCESSOR_ARCHITECTURE
-# We're on Windows NT
-CPU		= $(PROCESSOR_ARCHITECTURE)
-CONFIG_H	= config.nt
-OS_TYPE		= winnt
-! if "$(PROCESSOR_ARCHITECTURE)" == "x86"
-ARCH		= i386
-CPU		= i386
-! else
-!  if "$(PROCESSOR_ARCHITECTURE)" == "MIPS"
-ARCH		= mips
-!  else
-!   if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA"
-ARCH		= alpha
-!   else
-!    if "$(PROCESSOR_ARCHITECTURE)" == "PPC"
-ARCH		= ppc
-!    else
-!error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)"
-!    endif
-!   endif
-!  endif
-! endif
-!else
-# We're on Windows 95
-ARCH		= i386
-CPU		= i386
-CONFIG_H	= config.nt
-OS_TYPE		= win95
-!endif
-
-# Include ntwin32.mak.  So far, this file seems to be supported by every
-# Microsoft compiler on NT and Win95 and properly defines the executable
-# names and libraries necessary to build Emacs.  I do not have access 
-# to any other vendor compilers, so I do not know if they supply this 
-# file, too.  For now I'll assume that they do.
-#
-!include <ntwin32.mak>
-
-# Using cvtres is necessary on NT 3.10 and doesn't hurt on later platforms.
-CVTRES		= cvtres.exe
-AR		= $(implib)
-# The assignment $(CC) = $(cc) fails even though variables are case sensitive.
-LINK_TMP	= $(link)
-LINK		= $(LINK_TMP)
-CC_TMP		= $(cc)
-CC		= $(CC_TMP)
-
-# advapi32.lib is left off of $(baselibs) on NT 3.10
-!if "$(baselibs)" == "kernel32.lib "
-ADVAPI32	= advapi32.lib
-!else
-ADVAPI32	=
-!endif
-
-# Older ntwin32.mak files do not define libc; do it for them.
-!ifndef libc
-libc		= libc.lib
-!endif
-
-# The base libraries for compiling Emacs on NT.  With MSVC, this should
-# include oldnames.lib.
-!if $(MSVCNT11)
-BASE_LIBS	= $(libc) $(baselibs) oldnames.lib
-!else
-BASE_LIBS	= $(libc) $(baselibs)
-!endif
-
-# We want any debugging info in the executable.
-!if "$(LINK)" == "link32"
-SYS_LDFLAGS	= 
-!else
-SYS_LDFLAGS	= -pdb:none -release -incremental:no -version:3.10
-!endif
-
-INC             = -I.
-CFLAGS_COMMON	= -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH)
-!if $(MSVCNT11)
-CFLAGS          = $(CFLAGS_COMMON) -D_CRTAPI1=_cdecl
-!else
-CFLAGS          = $(CFLAGS_COMMON) 
-!endif
-!ifdef NTGUI
-CFLAGS          = $(CFLAGS) -DHAVE_NTGUI=1
-!endif
-
-!ifdef BUILD_TYPE
-OBJDIR          = obj-$(BUILD_TYPE)
-!else
-OBJDIR          = obj
-!endif
-$(OBJDIR):;	-mkdir $(OBJDIR)
-BLD             = $(OBJDIR)\$(ARCH)
-$(BLD):         $(OBJDIR)
-		-mkdir $(BLD)
-
-CP		= copy
-CP_DIR		= xcopy /f/r/i/e/d
-
-!if "$(OS_TYPE)" == "win95"
-DEL		= deltree /y
-DEL_TREE	= deltree /y
-!else
-DEL		= del
-# This is completely braindamaged, but it's the only routine known to be there
-DEL_TREE	= echo y | rmdir /s
-!endif
-
-# The location of the icon file
-EMACS_ICON_PATH = ..\nt\emacs.ico
-
-# Lets us add icons to the GNU Emacs folder
-ADDPM		= ..\nt\$(BLD)\addpm.exe
-
-!if "$(ARCH)" == "i386"
-!if "$(BUILD_TYPE)" == "spd"
-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -O2b2 -G5d -Zi
-!else
-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -G3d -Zi -Od
-!endif
-ARCH_LDFLAGS	= -align:0x1000 $(SYS_LDFLAGS)
-
-!else
-!if "$(ARCH)" == "mips"
-ARCH_CFLAGS     = -D_MIPS_=1 -c -W2 -Zi -Od -Gt0
-ARCH_LDFLAGS	= -align:0x1000 $(SYS_LDFLAGS)
-
-!else
-!if "$(ARCH)" == "alpha"
-ARCH_CFLAGS     = -D_ALPHA_=1 -c -Ze -Zi -W2 -D__stdcall= -D__cdecl=
-ARCH_LDFLAGS	= -align:0x2000 $(SYS_LDFLAGS)
-
-!else
-!if "$(ARCH)" == "ppc"
-# These flags are a guess...if they don't work, please send me mail.
-ARCH_CFLAGS	= -D_PPC_=1 -c -Ze -Zi -W2 -Od
-ARCH_LDFLAGS	= -align:0x1000 $(SYS_LDFLAGS)
-
-!else
-!ERROR Unknown architecture type "$(ARCH)".
-!endif
-!endif
-!endif
-!endif
diff --git a/nt/makefile.nt b/nt/makefile.nt
deleted file mode 100644
index 336dbfc836f..00000000000
--- a/nt/makefile.nt
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-#  Top level makefile for building GNU Emacs on Windows NT
-#
-#  This file is part of GNU Emacs.
-#  
-#  GNU Emacs 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.
-#  
-#  GNU Emacs 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 GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#   Geoff Voelker (voelker@cs.washington.edu)	11-20-93
-#						  9-6-94
-!include makefile.def
-
-ALL		= $(BLD)\addpm.exe $(BLD)\runemacs.exe
-!if $(MSVCNT11)
-TRES		= $(BLD)\emacs.res
-!else
-TRES		= $(BLD)\emacs.rbj
-!endif
-
-.c{$(BLD)}.obj:
-		  $(CC) $(CFLAGS) -Fo$@ $<
-
-addpm:		  $(BLD) $(BLD)\addpm.exe
-$(BLD)\addpm.obj: addpm.c
-$(BLD)\addpm.exe: $(BLD)\addpm.obj
-		  $(LINK) -out:$@ -subsystem:console -entry:mainCRTStartup \
-		  $(SYS_LDFLAGS) $** $(BASE_LIBS) $(ADVAPI32) user32.lib
-
-#
-# The resource file.  NT 3.10 requires the use of cvtres; even though
-# it is not necessary on later versions, it is still ok to use it.
-#
-$(TRES):	emacs.rc
-		$(RC) -Fo$(BLD)\emacs.res $**
-!if !$(MSVCNT11)
-		$(CVTRES) -r -$(ARCH) -o $@ $(BLD)\emacs.res
-!endif
-
-runemacs:	  $(BLD) $(BLD)\runemacs.exe
-$(BLD)\runemacs.obj: runemacs.c
-$(BLD)\runemacs.exe: $(BLD)\runemacs.obj $(TRES)
-		  $(LINK) -out:$@ -subsystem:windows -entry:WinMainCRTStartup \
-		  $(SYS_LDFLAGS) $** $(BASE_LIBS) $(ADVAPI32) user32.lib
-
-# Since Windows 95 does not support multiple commands on one command line
-# (e.g., in for loops), we cannot use for loops any more.
-# SUBDIRS	      = lib-src src lisp
-
-#
-# Build emacs
-#
-BUILD_CMD	= $(MAKE) -f makefile.nt all
-all:		$(BLD) $(ALL)
-		cd ..\lib-src
-		$(BUILD_CMD)
-		cd ..\src
-		$(BUILD_CMD)
-		cd ..\lisp
-		$(BUILD_CMD)
-		cd ..\nt
-
-
-emacs.bat:	emacs.bat.in
-		echo @echo off > emacs.bat
-		echo REM !!! Warning: This file automatically generated !!! >> emacs.bat
-		echo set emacs_dir=$(INSTALL_DIR)>> emacs.bat
-		type emacs.bat.in >> emacs.bat
-
-#
-# Build and install emacs in INSTALL_DIR
-#
-INSTALL_CMD	= $(MAKE) -f makefile.nt install
-install:	all emacs.bat
-		- mkdir $(INSTALL_DIR)
-		cd ..\lib-src
-		$(INSTALL_CMD)
-		cd ..\src
-		$(INSTALL_CMD)
-		cd ..\lisp
-		$(INSTALL_CMD)
-		cd ..\nt		
-		- $(CP) emacs.bat $(INSTALL_DIR)\bin
-		- $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
-		- $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
-		- $(ADDPM) $(INSTALL_DIR)
-		- $(DEL) ..\same-dir.tst
-		- $(DEL) $(INSTALL_DIR)\same-dir.tst
-		echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
-		if not exist ..\same-dir.tst $(MAKE) -f makefile.nt real_install
-		- $(DEL) ..\same-dir.tst
-		- $(DEL) $(INSTALL_DIR)\same-dir.tst
-
-#
-# This installs executables from ..\bin into the installation directory
-# without building anything.
-#
-fast_install:
-		- mkdir $(INSTALL_DIR)\data
-		$(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
-		- mkdir $(INSTALL_DIR)\bin
-		- $(CP) emacs.bat $(INSTALL_DIR)\bin
-		- $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
-		- $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
-		- $(DEL) ..\same-dir.tst
-		- $(DEL) $(INSTALL_DIR)\same-dir.tst
-		echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
-		if not exist ..\same-dir.tst $(CP) ..\bin\emacs.exe $(INSTALL_DIR)\bin
-		if not exist ..\same-dir.tst $(CP) ..\bin\etags.exe $(INSTALL_DIR)\bin
-		if not exist ..\same-dir.tst $(CP) ..\bin\ctags.exe $(INSTALL_DIR)\bin
-		if not exist ..\same-dir.tst nmake -f $(MAKE) real_install
-		- $(DEL) ..\same-dir.tst
-		- $(DEL) $(INSTALL_DIR)\same-dir.tst
-
-real_install:
-		- $(DEL) ..\same-dir.tst
-		- $(DEL) $(INSTALL_DIR)\same-dir.tst
-		echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
-		- mkdir $(INSTALL_DIR)\etc
-		- mkdir $(INSTALL_DIR)\info
-		- mkdir $(INSTALL_DIR)\lock
-		- mkdir $(INSTALL_DIR)\data
-		- mkdir $(INSTALL_DIR)\site-lisp
-		if not exist ..\same-dir.tst $(CP_DIR) ..\etc $(INSTALL_DIR)\etc
-		if not exist ..\same-dir.tst $(CP_DIR) ..\info $(INSTALL_DIR)\info
-		- $(DEL) ..\same-dir.tst
-		- $(DEL) $(INSTALL_DIR)\same-dir.tst
-
-#
-# Maintenance
-# 
-CLEAN_CMD	= $(MAKE) -f makefile.nt clean
-clean:;		- $(DEL) *~ *.pdb
-		- $(DEL_TREE) deleted
-		- $(DEL_TREE) $(OBJDIR)
-		- $(DEL_TREE) ..\bin
-		- $(DEL) ..\etc\DOC ..\etc\DOC-X
-		- $(DEL) emacs.bat
-		cd ..\lib-src
-		$(CLEAN_CMD)
-		cd ..\src
-		$(CLEAN_CMD)
-		cd ..\lisp
-		$(CLEAN_CMD)
-		cd ..\nt
diff --git a/nt/paths.h b/nt/paths.h
deleted file mode 100644
index f8a91e837cd..00000000000
--- a/nt/paths.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Hey Emacs, this is -*- C -*- code!  */
-
-/* Backslashify the default paths for NT */
-
-/* The default search path for Lisp function "load".
-   This sets load-path.  */
-/* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */
-#define PATH_LOADSEARCH "C:\\emacs\\lisp"
-
-/* Like PATH_LOADSEARCH, but used only when Emacs is dumping.  This
-   path is usually identical to PATH_LOADSEARCH except that the entry
-   for the directory containing the installed lisp files has been
-   replaced with ../lisp.  */
-/* #define PATH_DUMPLOADSEARCH "../lisp" */
-#define PATH_DUMPLOADSEARCH "..\\..\\..\\lisp"
-
-/* The extra search path for programs to invoke.  This is appended to
-   whatever the PATH environment variable says to set the Lisp
-   variable exec-path and the first file name in it sets the Lisp
-   variable exec-directory.  exec-directory is used for finding
-   executables and other architecture-dependent files.  */
-/* #define PATH_EXEC "/usr/local/lib/emacs/etc" */
-#define PATH_EXEC "C:\\emacs\\bin"
-
-/* Where Emacs should look for its architecture-independent data
-   files, like the NEWS file.  The lisp variable data-directory
-   is set to this value.  */
-/* #define PATH_DATA "/usr/local/lib/emacs/data" */
-#define PATH_DATA "C:\\emacs\\data"
-
-/* Where Emacs should look for its docstring file.  The lisp variable
-   doc-directory is set to this value.  */
-#define PATH_DOC "C:\\emacs\\etc"
-
-/* The name of the directory that contains lock files with which we
-   record what files are being modified in Emacs.  This directory
-   should be writable by everyone.  THE STRING MUST END WITH A
-   SLASH!!!  */
-/* #define PATH_LOCK "/usr/local/lib/emacs/lock/" */
-#define PATH_LOCK "C:\\emacs\\lock\\"
-
-/* Where the configuration process believes the info tree lives.  The
-   lisp variable configure-info-directory gets its value from this
-   macro, and is then used to set the Info-default-directory-list.  */
-/* #define PATH_INFO "/usr/local/info" */
-#define PATH_INFO "C:\\emacs\\info"
diff --git a/nt/runemacs.c b/nt/runemacs.c
deleted file mode 100644
index 88e14a30d81..00000000000
--- a/nt/runemacs.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-  Simple program to start Emacs with its console window hidden.
-
-  This program is provided purely for convenience, since most users will
-  use Emacs in windowing (GUI) mode, and will not want to have an extra
-  console window lying around.  */
-
-/*
-   You may want to define this if you want to be able to install updated
-   emacs binaries even when other users are using the current version.
-   The problem with some file servers (notably Novell) is that an open
-   file cannot be overwritten, deleted, or even renamed.  So if someone
-   is running emacs.exe already, you cannot install a newer version.
-   By defining CHOOSE_NEWEST_EXE, you can name your new emacs.exe
-   something else which matches "emacs*.exe", and runemacs will
-   automatically select the newest emacs executeable in the bin directory.
-   (So you'll probably be able to delete the old version some hours/days
-   later).
-*/
-
-/* #define CHOOSE_NEWEST_EXE */
-
-#define WIN32
-
-#include <windows.h>
-#include <string.h>
-#include <malloc.h>
-
-int WINAPI
-WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
-{
-  STARTUPINFO start;
-  SECURITY_ATTRIBUTES sec_attrs;
-  SECURITY_DESCRIPTOR sec_desc;
-  PROCESS_INFORMATION child;
-  int wait_for_child = FALSE;
-  DWORD ret_code = 0;
-  char *new_cmdline;
-  char *p;
-  char modname[MAX_PATH];
-
-  if (!GetModuleFileName (NULL, modname, MAX_PATH))
-    goto error;
-  if ((p = strrchr (modname, '\\')) == NULL)
-    goto error;
-  *p = 0;
-
-  new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 1);
-  strcpy (new_cmdline, modname);
-
-#ifdef CHOOSE_NEWEST_EXE
-  {
-    /* Silly hack to allow new versions to be installed on
-       server even when current version is in use. */
-
-    char * best_name = alloca (MAX_PATH + 1);
-    FILETIME best_time = {0,0};
-    WIN32_FIND_DATA wfd;
-    HANDLE fh;
-    p = new_cmdline + strlen (new_cmdline);
-    strcpy (p, "\\emacs*.exe ");
-    fh = FindFirstFile (new_cmdline, &wfd);
-    if (fh == INVALID_HANDLE_VALUE)
-      goto error;
-    do
-      {
-        if (wfd.ftLastWriteTime.dwHighDateTime > best_time.dwHighDateTime
-            || (wfd.ftLastWriteTime.dwHighDateTime == best_time.dwHighDateTime
-                && wfd.ftLastWriteTime.dwLowDateTime > best_time.dwLowDateTime))
-          {
-            best_time = wfd.ftLastWriteTime;
-            strcpy (best_name, wfd.cFileName);
-          }
-      }
-    while (FindNextFile (fh, &wfd));
-    FindClose (fh);
-    *p++ = '\\';
-    strcpy (p, best_name);
-    strcat (p, " ");
-  }
-#else
-  strcat (new_cmdline, "\\emacs.exe ");
-#endif
-
-  /* Append original arguments if any; first look for -wait as first
-     argument, and apply that ourselves.  */
-  if (strncmp (cmdline, "-wait", 5) == 0)
-    {
-      wait_for_child = TRUE;
-      cmdline += 5;
-    }
-  strcat (new_cmdline, cmdline);
-
-  /* Set emacs_dir variable if runemacs was in "%emacs_dir%\bin".  */
-  if ((p = strrchr (modname, '\\')) && stricmp (p, "\\bin") == 0)
-    {
-      *p = 0;
-      for (p = modname; *p; p++)
-	if (*p == '\\') *p = '/';
-      SetEnvironmentVariable ("emacs_dir", modname);
-    }
-
-  memset (&start, 0, sizeof (start));
-  start.cb = sizeof (start);
-  start.dwFlags = STARTF_USESHOWWINDOW;
-  start.wShowWindow = SW_HIDE;
-
-  sec_attrs.nLength = sizeof (sec_attrs);
-  sec_attrs.lpSecurityDescriptor = NULL;
-  sec_attrs.bInheritHandle = FALSE;
-
-  if (CreateProcess (NULL, new_cmdline, &sec_attrs, NULL, TRUE, 0,
-		     NULL, NULL, &start, &child))
-    {
-      if (wait_for_child)
-	{
-	  WaitForSingleObject (child.hProcess, INFINITE);
-	  GetExitCodeProcess (child.hProcess, &ret_code);
-	}
-      CloseHandle (child.hThread);
-      CloseHandle (child.hProcess);
-    }
-  else
-    goto error;
-  return (int) ret_code;
-
-error:
-  MessageBox (NULL, "Could not start Emacs.", "Error", MB_ICONSTOP);
-  return 1;
-}