Moved most of vc-dir from vc.el to vc-dispatcher.el.

[bpt/emacs.git] / nt / config.nt

diff --git a/nt/config.nt b/nt/config.nt
index 30dd5be..a8075a7 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,6 +1,6 @@
 /* GNU Emacs site configuration template file.  -*- C -*-
    Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -77,9 +77,6 @@ Boston, MA 02110-1301, USA.  */
 /* Define if we have the X11R6 or newer version of Xlib.  */
 #undef HAVE_X11R6
 
-/* Define if we have the X11R5 or newer version of Xlib.  */
-#undef HAVE_X11R5
-
 /* Define if netdb.h declares h_errno.  */
 #undef HAVE_H_ERRNO
 
@@ -314,17 +311,6 @@ Boston, MA 02110-1301, USA.  */
 #undef config_machfile
 #include "m/intel386.h"
 
-/* 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