From: Glenn Morris <rgm@gnu.org>
Date: Sat, 15 Aug 2015 17:40:06 +0000 (-0700)
Subject: * admin/admin.el (set-version, set-copyright): Remove deleted files.
X-Git-Tag: emacs-25.0.90~1373^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=208cfda3aa174d81952ff35272a467f8cb7e539e;p=emacs.git

* admin/admin.el (set-version, set-copyright): Remove deleted files.

; * src/emacs,c, lib-src/ntlib.c: Comment updates.
---

diff --git a/admin/admin.el b/admin/admin.el
index 267f2c4afea..914f187b1e8 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -88,21 +88,12 @@ Root must be the root of an Emacs source tree."
 		       (rx (and "AC_INIT" (1+ (not (in ?,)))
                                 ?, (0+ space)
                                 (submatch (1+ (in "0-9."))))))
-  ;; No longer used, broken in multiple ways, updating version seems pointless.
-  (set-version-in-file root "nt/config.nt" version
-		       (rx (and bol "#" (0+ blank) "define" (1+ blank)
-				"VERSION" (1+ blank) "\""
-				(submatch (1+ (in "0-9."))))))
   ;; TODO: msdos could easily extract the version number from
   ;; configure.ac with sed, rather than duplicating the information.
   (set-version-in-file root "msdos/sed2v2.inp" version
 		       (rx (and bol "/^#undef " (1+ not-newline)
 				"define VERSION" (1+ space) "\""
 				(submatch (1+ (in "0-9."))))))
-  ;; No longer used, broken in multiple ways, updating version seems pointless.
-  (set-version-in-file root "nt/makefile.w32-in" version
-		       (rx (and "VERSION" (0+ space) "=" (0+ space)
-				(submatch (1+ (in "0-9."))))))
   ;; Major version only.
   (when (string-match "\\([0-9]\\{2,\\}\\)" version)
     (setq version (match-string 1 version))
@@ -134,10 +125,6 @@ Root must be the root of an Emacs source tree."
 		       (rx (and bol "/^#undef " (1+ not-newline)
 				"define COPYRIGHT" (1+ space)
 				?\" (submatch (1+ (not (in ?\")))) ?\")))
-  (set-version-in-file root "nt/config.nt" copyright
-		       (rx (and bol "#" (0+ blank) "define" (1+ blank)
-				"COPYRIGHT" (1+ blank)
-				?\" (submatch (1+ (not (in ?\")))) ?\")))
   (set-version-in-file root "lib-src/rcs2log" copyright
         	       (rx (and "Copyright" (0+ space) ?= (0+ space)
         			?\' (submatch (1+ nonl)))))
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 7d9dff9904c..37b847ba6e7 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -302,7 +302,7 @@ is_exec (const char * name)
 	 stricmp (p, ".cmd") == 0));
 }
 
-/* FIXME?  This is in config.nt now - is this still needed?  */
+/* FIXME?  This is in configure.ac now - is this still needed?  */
 #define IS_DIRECTORY_SEP(x) ((x) == '/' || (x) == '\\')
 
 /* We need this because nt/inc/sys/stat.h defines struct stat that is
diff --git a/src/emacs.c b/src/emacs.c
index aace618b300..80bb70cedeb 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2429,7 +2429,7 @@ Special values:
 Anything else (in Emacs 24.1, the possibilities are: aix, berkeley-unix,
 hpux, irix, usg-unix-v) indicates some sort of Unix system.  */);
   Vsystem_type = intern_c_string (SYSTEM_TYPE);
-  /* See configure.ac (and config.nt) for the possible SYSTEM_TYPEs.  */
+  /* See configure.ac for the possible SYSTEM_TYPEs.  */
 
   DEFVAR_LISP ("system-configuration", Vsystem_configuration,
 	       doc: /* Value is string indicating configuration Emacs was built for.  */);