Commit 8de9005d authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from trunk.

parents 856bbc81 ab22a8a1
...@@ -2,7 +2,7 @@ Copyright (C) 2001-2011 Free Software Foundation, Inc. ...@@ -2,7 +2,7 @@ Copyright (C) 2001-2011 Free Software Foundation, Inc.
See the end of the file for license conditions. See the end of the file for license conditions.
This directory tree holds version 24.0.50 of GNU Emacs, the extensible, This directory tree holds version 24.0.90 of GNU Emacs, the extensible,
customizable, self-documenting real-time display editor. customizable, self-documenting real-time display editor.
The file INSTALL in this directory says how to build and install GNU The file INSTALL in this directory says how to build and install GNU
......
2011-09-26 Chong Yidong <cyd@stupidchicken.com>
* admin.el (set-version): Fix regexps for config.nt and
sed2v2.inp.
2011-09-06 Paul Eggert <eggert@cs.ucla.edu> 2011-09-06 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib (Bug#9169). Merge from gnulib (Bug#9169).
......
...@@ -75,11 +75,11 @@ Root must be the root of an Emacs source tree." ...@@ -75,11 +75,11 @@ Root must be the root of an Emacs source tree."
(submatch (1+ (in "0-9.")))))) (submatch (1+ (in "0-9."))))))
(set-version-in-file root "nt/config.nt" version (set-version-in-file root "nt/config.nt" version
(rx (and bol "#" (0+ blank) "define" (1+ blank) (rx (and bol "#" (0+ blank) "define" (1+ blank)
"VERSION" (1+ blank) "VERSION" (1+ blank) "\""
(submatch (1+ (in "0-9.")))))) (submatch (1+ (in "0-9."))))))
(set-version-in-file root "msdos/sed2v2.inp" version (set-version-in-file root "msdos/sed2v2.inp" version
(rx (and bol "/^#undef " (1+ not-newline) (rx (and bol "/^#undef " (1+ not-newline)
"define VERSION" (1+ space) "define VERSION" (1+ space) "\""
(submatch (1+ (in "0-9.")))))) (submatch (1+ (in "0-9."))))))
(set-version-in-file root "nt/makefile.w32-in" version (set-version-in-file root "nt/makefile.w32-in" version
(rx (and "VERSION" (0+ space) "=" (0+ space) (rx (and "VERSION" (0+ space) "=" (0+ space)
......
...@@ -62,37 +62,26 @@ For each step, check for possible errors. ...@@ -62,37 +62,26 @@ For each step, check for possible errors.
number of the old Emacs to __, do the same with the new log and do number of the old Emacs to __, do the same with the new log and do
M-x ediff. Especially check that Info files aren't built. M-x ediff. Especially check that Info files aren't built.
10. cd EMACS_ROOT_DIR; cvs tag TAG 10. cd EMACS_ROOT_DIR; bzr tag TAG
TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
release. release.
Shortly before the release, cut the branch with the following commands: Shortly before the release, cut the version branch also, and open
a Savannah support request asking for commits to the new branch to
cvs rtag EMACS_`NUMBER'_BASE be sent to the emacs-diffs mailing list (by default, the list
cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE normally only gets commits to the trunk).
where `NUMBER' is the major version number of the release. This
makes it easier to see what changes have been applied to the
branch with:
cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC
or merge changes back to the trunk with "cvs update -j", if
necessary.
After doing this, increase the version number on the trunk as per
step 4.
Also, open a Savannah support request asking for commits to the
new branch to be sent to the emacs-diffs mailing list (by default,
the list normally only gets commits to the trunk).
11. Now you should upload the files to the GNU ftp server. In order to 11. Now you should upload the files to the GNU ftp server. In order to
do that, you must be registered as an Emacs maintainer and have your do that, you must be registered as an Emacs maintainer and have your
GPG key acknowledged by the ftp people. Mail <ftp-upload@gnu.org> GPG key acknowledged by the ftp people. Mail <ftp-upload@gnu.org>
for instructions. Once you are there, for each file FILE to be for instructions.
released, create a detached GPG binary signature and a clearsigned
directive file like this: You can use the gnupload script to upload each FILE, like this:
gnupload --to alpha.gnu.org:emacs/pretest FILE (for a pretest)
gnupload --to ftp.gnu.org:emacs FILE (for a release)
Instead of using gnupload, for each FILE, create a detached GPG
binary signature and a clearsigned directive file like this:
gpg -b FILE gpg -b FILE
echo directory: emacs/pretest > FILE.directive (for a pretest) echo directory: emacs/pretest > FILE.directive (for a pretest)
echo directory: emacs > FILE.directive (for a release) echo directory: emacs > FILE.directive (for a release)
......
...@@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License ...@@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.65) AC_PREREQ(2.65)
AC_INIT(emacs, 24.0.50) AC_INIT(emacs, 24.0.90)
AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_HEADER(src/config.h:src/config.in)
AC_CONFIG_SRCDIR(src/lisp.h) AC_CONFIG_SRCDIR(src/lisp.h)
AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_AUX_DIR(build-aux)
......
@c It would be nicer to generate this using configure and @version@. @c It would be nicer to generate this using configure and @version@.
@c However, that would mean emacsver.texi would always be newer @c However, that would mean emacsver.texi would always be newer
@c then the info files in release tarfiles. @c then the info files in release tarfiles.
@set EMACSVER 24.0.50 @set EMACSVER 24.0.90
.\" See section COPYING for copyright and redistribution information. .\" See section COPYING for copyright and redistribution information.
.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.50" .TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.90"
. .
. .
.SH NAME .SH NAME
......
This diff is collapsed.
This diff is collapsed.
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
/^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
/^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
/^#undef VERSION/s/^.*$/#define VERSION "24.0.50"/ /^#undef VERSION/s/^.*$/#define VERSION "24.0.90"/
/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
/^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/ /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/
......
...@@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ...@@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Emacs</string> <string>Emacs</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>Emacs 24.0.50 Copyright (C) 2011 Free Software Foundation, Inc.</string> <string>Emacs 24.0.90 Copyright (C) 2011 Free Software Foundation, Inc.</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Emacs.icns</string> <string>Emacs.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
...@@ -566,7 +566,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ...@@ -566,7 +566,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
<string>APPL</string> <string>APPL</string>
<!-- This should be the emacs version number. --> <!-- This should be the emacs version number. -->
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>24.0.50</string> <string>24.0.90</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>EMAx</string> <string>EMAx</string>
<!-- This SHOULD be a build number. --> <!-- This SHOULD be a build number. -->
......
/* Localized versions of Info.plist keys */ /* Localized versions of Info.plist keys */
CFBundleName = "Emacs"; CFBundleName = "Emacs";
CFBundleShortVersionString = "Version 24.0.50"; CFBundleShortVersionString = "Version 24.0.90";
CFBundleGetInfoString = "Emacs version 24.0.50, NS Windowing"; CFBundleGetInfoString = "Emacs version 24.0.90, NS Windowing";
NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Type=Application Type=Application
Version=24.0.50 Version=24.0.90
Categories=GNUstep Categories=GNUstep
Name=Emacs Name=Emacs
Comment=GNU Emacs for NeXT/Open/GNUstep and OS X Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationDescription = "GNU Emacs for GNUstep / OS X";
ApplicationIcon = emacs.tiff; ApplicationIcon = emacs.tiff;
ApplicationName = Emacs; ApplicationName = Emacs;
ApplicationRelease = "24.0.50"; ApplicationRelease = "24.0.90";
Authors = ( Authors = (
"Adrian Robert (GNUstep)", "Adrian Robert (GNUstep)",
"Christophe de Dinechin (MacOS X)", "Christophe de Dinechin (MacOS X)",
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
); );
Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
FullVersionID = "Emacs 24.0.50, NS Windowing"; FullVersionID = "Emacs 24.0.90, NS Windowing";
NSExecutable = Emacs; NSExecutable = Emacs;
NSIcon = emacs.tiff; NSIcon = emacs.tiff;
NSPrincipalClass = NSApplication; NSPrincipalClass = NSApplication;
......
...@@ -317,7 +317,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -317,7 +317,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define PACKAGE "emacs" #define PACKAGE "emacs"
/* Version number of package */ /* Version number of package */
#define VERSION "24.0.50" #define VERSION "24.0.90"
/* Define to `__inline__' or `__inline' if that's what the C compiler /* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */ calls it, or to nothing if 'inline' is not supported under any name. */
......
...@@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico ...@@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico
#endif #endif
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 24,0,50,0 FILEVERSION 24,0,90,0
PRODUCTVERSION 24,0,50,0 PRODUCTVERSION 24,0,90,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG #ifdef EMACSDEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
...@@ -25,12 +25,12 @@ BEGIN ...@@ -25,12 +25,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Free Software Foundation\0" VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
VALUE "FileVersion", "24, 0, 50, 0\0" VALUE "FileVersion", "24, 0, 90, 0\0"
VALUE "InternalName", "Emacs\0" VALUE "InternalName", "Emacs\0"
VALUE "LegalCopyright", "Copyright (C) 2001-2011\0" VALUE "LegalCopyright", "Copyright (C) 2001-2011\0"
VALUE "OriginalFilename", "emacs.exe" VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs\0" VALUE "ProductName", "Emacs\0"
VALUE "ProductVersion", "24, 0, 50, 0\0" VALUE "ProductVersion", "24, 0, 90, 0\0"
VALUE "OLESelfRegister", "\0" VALUE "OLESelfRegister", "\0"
END END
END END
......
...@@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico ...@@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico
#endif #endif
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 24,0,50,0 FILEVERSION 24,0,90,0
PRODUCTVERSION 24,0,50,0 PRODUCTVERSION 24,0,90,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG #ifdef EMACSDEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
...@@ -23,12 +23,12 @@ BEGIN ...@@ -23,12 +23,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Free Software Foundation\0" VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
VALUE "FileVersion", "24, 0, 50, 0\0" VALUE "FileVersion", "24, 0, 90, 0\0"
VALUE "InternalName", "EmacsClient\0" VALUE "InternalName", "EmacsClient\0"
VALUE "LegalCopyright", "Copyright (C) 2001-2011\0" VALUE "LegalCopyright", "Copyright (C) 2001-2011\0"
VALUE "OriginalFilename", "emacsclientw.exe" VALUE "OriginalFilename", "emacsclientw.exe"
VALUE "ProductName", "EmacsClient\0" VALUE "ProductName", "EmacsClient\0"
VALUE "ProductVersion", "24, 0, 50, 0\0" VALUE "ProductVersion", "24, 0, 90, 0\0"
VALUE "OLESelfRegister", "\0" VALUE "OLESelfRegister", "\0"
END END
END END
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
# (and remove or replace this comment). # (and remove or replace this comment).
VERSION = 24.0.50 VERSION = 24.0.90
TMP_DIST_DIR = emacs-$(VERSION) TMP_DIST_DIR = emacs-$(VERSION)
......
...@@ -2927,7 +2927,7 @@ ...@@ -2927,7 +2927,7 @@
* nsimage.m (EmacsImage-setXBMColor:): Correct previous patch: * nsimage.m (EmacsImage-setXBMColor:): Correct previous patch:
don't change the method signature, change the return. don't change the method signature, change the return.
2010-11-04 Ismail Donmez <ismail@namtrac.org> (tiny change) 2010-11-04 İsmail Dönmez <ismail@namtrac.org> (tiny change)
* nsfont.m (nsfont_draw) * nsfont.m (nsfont_draw)
* nsimage.m (EmacsImage-setXBMColor:) * nsimage.m (EmacsImage-setXBMColor:)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment