From f3774f20c34ca2590d3ea58d44317386aca9016e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 7 Apr 2012 13:00:16 -0700 Subject: Bump trunk version to 24.1.50. * README, configure.in (AC_INIT): Bump version to 24.1.50. * doc/emacs/emacsver.texi (EMACSVER): Bump version to 24.1.50. * doc/man/emacs.1: Bump version to 24.1.50. * msdos/sed2v2.inp: Bump version to 24.1.50. * nextstep/Cocoa/Emacs.base/Contents/Info.plist: * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: * nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Bump version to 24.1.50. * nt/config.nt, nt/makefile.w32-in, nt/emacs.rc, nt/emacsclient.rc: Bump version to 24.1.50. --- ChangeLog | 4 ++++ README | 2 +- configure.in | 4 ++-- doc/emacs/ChangeLog | 4 ++++ doc/emacs/emacsver.texi | 2 +- doc/man/ChangeLog | 4 ++++ doc/man/emacs.1 | 2 +- msdos/ChangeLog | 4 ++++ msdos/sed2v2.inp | 2 +- nextstep/ChangeLog | 8 ++++++++ nextstep/Cocoa/Emacs.base/Contents/Info.plist | 4 ++-- .../Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | 4 ++-- nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop | 2 +- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | 4 ++-- nt/ChangeLog | 5 +++++ nt/config.nt | 2 +- nt/emacs.rc | 8 ++++---- nt/emacsclient.rc | 8 ++++---- nt/makefile.w32-in | 2 +- 19 files changed, 52 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c0e8104c4..c390325820 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-04-07 Glenn Morris + + * README, configure.in (AC_INIT): Bump version to 24.1.50. + 2012-04-07 Eli Zaretskii * lib/makefile.w32-in (gnulib, all): Don't depend on stamp_BLD. diff --git a/README b/README index 8710ad438a..4e1a4c4556 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2012 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 24.0.95 of GNU Emacs, the extensible, +This directory tree holds version 24.1.50 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/configure.in b/configure.in index 78d8111544..20b6de0724 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl autoconf dnl in the directory containing this script. dnl If you changed any AC_DEFINES, also run autoheader. dnl -dnl Copyright (C) 1994-1996, 1999-2012 Free Software Foundation, Inc. +dnl Copyright (C) 1994-1996, 1999-2012 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -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 . AC_PREREQ(2.65) -AC_INIT(emacs, 24.0.95) +AC_INIT(emacs, 24.1.50) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) AC_CONFIG_AUX_DIR(build-aux) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 8b50579ba1..549b677c4f 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-04-07 Glenn Morris + + * emacsver.texi (EMACSVER): Bump version to 24.1.50. + 2012-04-05 Glenn Morris * glossary.texi (Glossary): Use anchors for internal cross-references. diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index 809fbcb644..88c6f2c604 100644 --- a/doc/emacs/emacsver.texi +++ b/doc/emacs/emacsver.texi @@ -1,4 +1,4 @@ @c It would be nicer to generate this using configure and @version@. @c However, that would mean emacsver.texi would always be newer @c then the info files in release tarfiles. -@set EMACSVER 24.0.95 +@set EMACSVER 24.1.50 diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index b6def1a7d8..cf7e1a50c9 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2012-04-07 Glenn Morris + + * emacs.1: Bump version to 24.1.50. + 2011-11-16 Juanma Barranquero * etags.1: Fix typo. diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 94d2a0c35b..ff67324568 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.95" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.1.50" . . .SH NAME diff --git a/msdos/ChangeLog b/msdos/ChangeLog index b057a06bbd..0c00364d6f 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2012-04-07 Glenn Morris + + * sed2v2.inp: Bump version to 24.1.50. + 2012-02-04 Eli Zaretskii * sed3v2.inp (insrcdir): Use $( + + * Cocoa/Emacs.base/Contents/Info.plist: + * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: + * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + * GNUstep/Emacs.base/Resources/Emacs.desktop: + Bump version to 24.1.50. + 2012-01-05 Glenn Morris * Cocoa/Emacs.base/Contents/Info.plist: diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 8fa9d4a125..31100020cc 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see . CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 24.0.95 Copyright (C) 2012 Free Software Foundation, Inc. + Emacs 24.1.50 Copyright (C) 2012 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 24.0.95 + 24.1.50 CFBundleSignature EMAx diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index 4be577ecc1..cd1920317b 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Version 24.0.95"; -CFBundleGetInfoString = "Emacs version 24.0.95, NS Windowing"; +CFBundleShortVersionString = "Version 24.1.50"; +CFBundleGetInfoString = "Emacs version 24.1.50, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index add1a608a5..4e79b4f380 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop +++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Version=24.0.95 +Version=24.1.50 Categories=GNUstep Name=Emacs Comment=GNU Emacs for NeXT/Open/GNUstep and OS X diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index 86e3897421..e22b9daa37 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist @@ -2,7 +2,7 @@ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; - ApplicationRelease = "24.0.95"; + ApplicationRelease = "24.1.50"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 24.0.95, NS Windowing"; + FullVersionID = "Emacs 24.1.50, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/ChangeLog b/nt/ChangeLog index 88cafb5985..349a43fe69 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2012-04-07 Glenn Morris + + * config.nt, makefile.w32-in, emacs.rc, emacsclient.rc: + Bump version to 24.1.50. + 2012-04-07 Eli Zaretskii * configure.bat: Support building with libxml2. diff --git a/nt/config.nt b/nt/config.nt index 2e8215b348..8aadf2c150 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -331,7 +331,7 @@ along with GNU Emacs. If not, see . */ #define PACKAGE "emacs" /* Version number of package */ -#define VERSION "24.0.95" +#define VERSION "24.1.50" /* 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. */ diff --git a/nt/emacs.rc b/nt/emacs.rc index a5fd0e3163..7a6b00ef2a 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,0,95,0 - PRODUCTVERSION 24,0,95,0 + FILEVERSION 24,1,50,0 + PRODUCTVERSION 24,1,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 0, 95, 0\0" + VALUE "FileVersion", "24, 1, 50, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 0, 95, 0\0" + VALUE "ProductVersion", "24, 1, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index f0543ea1a6..d99b2fcd8f 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,0,95,0 - PRODUCTVERSION 24,0,95,0 + FILEVERSION 24,1,50,0 + PRODUCTVERSION 24,1,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 0, 95, 0\0" + VALUE "FileVersion", "24, 1, 50, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 0, 95, 0\0" + VALUE "ProductVersion", "24, 1, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 48f4e299fc..f090849e6a 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -22,7 +22,7 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). -VERSION = 24.0.95 +VERSION = 24.1.50 TMP_DIST_DIR = emacs-$(VERSION) -- cgit v1.2.3