diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-04-08 16:25:22 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-04-08 16:25:22 +0000 |
| commit | 1b9ab2508610fea57aa777956de14ee84d66862f (patch) | |
| tree | 81ea3750f64077094896b304ce977f065aed57c2 /mac | |
| parent | ee00ea6e18c2aeae86e262fae703f67f4705032a (diff) | |
| parent | 5b4879885e61279efd5a779369deeddfeea8c1fd (diff) | |
| download | emacs-1b9ab2508610fea57aa777956de14ee84d66862f.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 56-58, 232-239)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-232
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-233
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-234
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-235
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-236
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-237
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-238
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-239
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-56
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-57
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-58
Collapse feature addition/removal within single ChangeLog entry
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-325
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/ChangeLog | 8 | ||||
| -rw-r--r-- | mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | mac/src/Emacs.r | 18 |
3 files changed, 19 insertions, 11 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index 8b12032ce5c..9a1ded737ff 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,11 @@ +2005-04-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings + (CFBundleShortVersionString, CFBundleGetInfoString): Fix version + number and copyright. + + * Emacs.r (DITL, vers): Likewise. + 2005-03-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * Emacs.app/Contents/Info.plist (CFBundleIdentifier): Change to diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings index b111726765b..8aa3d82c261 100644 --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Emacs version 21"; -CFBundleGetInfoString = "Emacs version 21, Copyright 2002 FSF."; +CFBundleShortVersionString = "22.0.50"; +CFBundleGetInfoString = "22.0.50, Copyright (C) 2005 Free Software Foundation, Inc."; diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index 1403a24721c..804e55f700b 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r @@ -141,7 +141,7 @@ resource 'DITL' (128, purgeable) { {10, 60, 72, 278}, StaticText { disabled, - "GNU Emacs 21 for Mac OS" + "GNU Emacs 22 for Mac OS" } } }; @@ -215,14 +215,14 @@ resource 'FREF' (129) { }; resource 'vers' (1) { - 0x1, - 0x0, - development, - 0x0, - 0, - "d6", - "GNU Emacs 21.1 for Mac OS\n\0xa9 2" - "000 Free Software Foundation" + 0x22, /* Major revision in BCD */ + 0x0, /* Minor revision in BCD */ + development, /* development, alpha, beta, or final (release) */ + 50, /* Non-final release # */ + 0, /* Region code */ + "22.0.50", /* Short version number */ + "22.0.50, Copyright \0xa9 2005 " + "Free Software Foundation, Inc." /* Long version number */ }; data 'EMAx' (0, "Owner resource") { |