[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 208cfda: * admin/admin.el (set-version, set-copyrig
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 208cfda: * admin/admin.el (set-version, set-copyright): Remove deleted files. |
Date: |
Sat, 15 Aug 2015 17:40:30 +0000 |
branch: master
commit 208cfda3aa174d81952ff35272a467f8cb7e539e
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* admin/admin.el (set-version, set-copyright): Remove deleted files.
; * src/emacs,c, lib-src/ntlib.c: Comment updates.
---
admin/admin.el | 13 -------------
lib-src/ntlib.c | 2 +-
src/emacs.c | 2 +-
3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/admin/admin.el b/admin/admin.el
index 267f2c4..914f187 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 7d9dff9..37b847b 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 aace618..80bb70c 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. */);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 208cfda: * admin/admin.el (set-version, set-copyright): Remove deleted files.,
Glenn Morris <=