aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2008-10-23 02:39:14 +0000
committerGlenn Morris2008-10-23 02:39:14 +0000
commit91236f636eff8b9edcc73ef7e4798ad547eee9a8 (patch)
tree5251be60fa7583a063646fb32fe04d93dcc0b39e /admin
parent3c4be1f2710ba8311d45cebe5be94952acac92a6 (diff)
downloademacs-91236f636eff8b9edcc73ef7e4798ad547eee9a8.tar.gz
emacs-91236f636eff8b9edcc73ef7e4798ad547eee9a8.zip
(set-version): Add doc/misc/ns-emacs.texi.
Add/tweak some nextstep/ entries.
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/admin.el16
2 files changed, 18 insertions, 3 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7401af205e6..6eb96a9e03a 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12008-10-23 Glenn Morris <rgm@gnu.org>
2
3 * admin.el (set-version): Add doc/misc/ns-emacs.texi.
4 Add/tweak some nextstep/ entries.
5
12008-09-19 Kenichi Handa <handa@m17n.org> 62008-09-19 Kenichi Handa <handa@m17n.org>
2 7
3 * FOR-RELEASE: Add an item for using EMACS_INT for buffer/string 8 * FOR-RELEASE: Add an item for using EMACS_INT for buffer/string
diff --git a/admin/admin.el b/admin/admin.el
index d30583cd07c..705c4db8459 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -92,6 +92,9 @@ Root must be the root of an Emacs source tree."
92 (set-version-in-file root "doc/misc/faq.texi" version 92 (set-version-in-file root "doc/misc/faq.texi" version
93 (rx (and "VER" (1+ space) 93 (rx (and "VER" (1+ space)
94 (submatch (1+ (in "0-9.")))))) 94 (submatch (1+ (in "0-9."))))))
95 (set-version-in-file root "doc/misc/ns-emacs.texi" version
96 (rx (and "VER" (1+ space)
97 (submatch (1+ (in "0-9."))))))
95 (set-version-in-file root "lib-src/makefile.w32-in" version 98 (set-version-in-file root "lib-src/makefile.w32-in" version
96 (rx (and "VERSION" (0+ space) "=" (0+ space) 99 (rx (and "VERSION" (0+ space) "=" (0+ space)
97 (submatch (1+ (in "0-9.")))))) 100 (submatch (1+ (in "0-9."))))))
@@ -145,8 +148,8 @@ Root must be the root of an Emacs source tree."
145 (submatch (1+ (in "0-9.")))))) 148 (submatch (1+ (in "0-9."))))))
146 (set-version-in-file 149 (set-version-in-file
147 root "nextstep/Cocoa/Emacs.base/Contents/Info.plist" 150 root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
148 version (rx (and "CFBundleShortVersionString" (1+ anything) 151 version (rx (and "CFBundleShortVersionString" (1+ not-newline) ?\n
149 "Version" (1+ space) 152 (0+ not-newline) "<string>" (0+ space)
150 (submatch (1+ (in "0-9.")))))) 153 (submatch (1+ (in "0-9."))))))
151 (set-version-in-file 154 (set-version-in-file
152 root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings" 155 root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
@@ -160,9 +163,16 @@ Root must be the root of an Emacs source tree."
160 (submatch (1+ (in "0-9.")))))) 163 (submatch (1+ (in "0-9."))))))
161 (set-version-in-file 164 (set-version-in-file
162 root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist" 165 root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
166 version (rx (and "ApplicationRelease" (0+ space) ?= (0+ space)
167 ?\" (0+ space) (submatch (1+ (in "0-9."))))))
168 (set-version-in-file
169 root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
163 version (rx (and "FullVersionID" (0+ space) ?= (0+ space) 170 version (rx (and "FullVersionID" (0+ space) ?= (0+ space)
164 ?\" (0+ space) "Emacs" (1+ space) 171 ?\" (0+ space) "Emacs" (1+ space)
165 (submatch (1+ (in "0-9."))))))) 172 (submatch (1+ (in "0-9."))))))
173 (set-version-in-file
174 root "nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop"
175 version (rx (and "Version=" (submatch (1+ (in "0-9.")))))))
166 176
167;; Note this makes some assumptions about form of short copyright. 177;; Note this makes some assumptions about form of short copyright.
168;; FIXME add the \year in the refcards/*.tex files. 178;; FIXME add the \year in the refcards/*.tex files.