emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108111: Bump version to 24.2


From: Chong Yidong
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108111: Bump version to 24.2
Date: Thu, 16 Aug 2012 00:12:37 +0800
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 108111
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-08-16 00:12:37 +0800
message:
  Bump version to 24.2
modified:
  ChangeLog
  README
  admin/ChangeLog
  configure.in
  doc/emacs/ChangeLog
  doc/emacs/emacsver.texi
  doc/lispintro/ChangeLog
  doc/lispref/ChangeLog
  doc/man/ChangeLog
  doc/man/emacs.1
  doc/misc/ChangeLog
  etc/ChangeLog
  leim/ChangeLog
  lib-src/ChangeLog
  lisp/ChangeLog
  lisp/cedet/ChangeLog
  lisp/erc/ChangeLog
  lisp/mh-e/ChangeLog
  lisp/org/ChangeLog
  lisp/url/ChangeLog
  lwlib/ChangeLog
  msdos/ChangeLog
  msdos/sed2v2.inp
  nextstep/ChangeLog
  nextstep/Cocoa/Emacs.base/Contents/Info.plist
  nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
  nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
  nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
  nt/ChangeLog
  nt/config.nt
  nt/emacs.rc
  nt/emacsclient.rc
  nt/makefile.w32-in
  oldXMenu/ChangeLog
  src/ChangeLog
  test/ChangeLog
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-08-14 09:59:25 +0000
+++ b/ChangeLog 2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-08-14  Ulrich Mueller  <address@hidden>
 
        * lib/gnulib.mk:

=== modified file 'README'
--- a/README    2012-06-01 09:51:00 +0000
+++ b/README    2012-08-15 16:12:37 +0000
@@ -2,7 +2,7 @@
 See the end of the file for license conditions.
 
 
-This directory tree holds version 24.1 of GNU Emacs, the extensible,
+This directory tree holds version 24.2 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

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-08-10 06:57:34 +0000
+++ b/admin/ChangeLog   2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-08-10  Glenn Morris  <address@hidden>
 
        * bzrmerge.el (bzrmerge-resolve): Disable local eval:.

=== modified file 'configure.in'
--- a/configure.in      2012-06-21 19:42:32 +0000
+++ b/configure.in      2012-08-15 16:12:37 +0000
@@ -22,7 +22,7 @@
 dnl  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.65)
-AC_INIT(emacs, 24.1)
+AC_INIT(emacs, 24.2)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 AC_CONFIG_SRCDIR(src/lisp.h)
 AC_CONFIG_AUX_DIR(build-aux)

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-07-31 03:53:10 +0000
+++ b/doc/emacs/ChangeLog       2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-07-31  Chong Yidong  <address@hidden>
 
        * emacs.texi: Fix ISBN (Bug#12080).

=== modified file 'doc/emacs/emacsver.texi'
--- a/doc/emacs/emacsver.texi   2012-06-01 09:51:00 +0000
+++ b/doc/emacs/emacsver.texi   2012-08-15 16:12:37 +0000
@@ -1,4 +1,4 @@
 @c It would be nicer to generate this using configure and @address@hidden
 @c However, that would mean emacsver.texi would always be newer
 @c then the info files in release tarfiles.
address@hidden EMACSVER 24.1
address@hidden EMACSVER 24.2

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2012-06-19 01:59:38 +0000
+++ b/doc/lispintro/ChangeLog   2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-19  Glenn Morris  <address@hidden>
 
        * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-08-06 16:55:41 +0000
+++ b/doc/lispref/ChangeLog     2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-08-06  Eli Zaretskii  <address@hidden>
 
        * functions.texi (Closures): Put the main index entry for

=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2012-06-01 09:51:00 +0000
+++ b/doc/man/ChangeLog 2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'doc/man/emacs.1'
--- a/doc/man/emacs.1   2012-06-01 09:51:00 +0000
+++ b/doc/man/emacs.1   2012-08-15 16:12:37 +0000
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 24.1"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.2"
 .
 .
 .SH NAME

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-08-06 21:50:25 +0000
+++ b/doc/misc/ChangeLog        2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-08-06  Aurélien Aptel  <address@hidden>
 
        * url.texi (Parsed URLs): Adjust to the code's use of defstruct

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2012-06-01 09:51:00 +0000
+++ b/etc/ChangeLog     2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2012-06-01 09:51:00 +0000
+++ b/leim/ChangeLog    2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-06-01 09:51:00 +0000
+++ b/lib-src/ChangeLog 2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-15 12:26:48 +0000
+++ b/lisp/ChangeLog    2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-08-15  Leo Liu  <address@hidden>
 
        * net/rcirc.el (rcirc-split-message): Fix for buffer-local

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2012-06-01 09:51:00 +0000
+++ b/lisp/cedet/ChangeLog      2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-06-01 09:51:00 +0000
+++ b/lisp/erc/ChangeLog        2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'lisp/mh-e/ChangeLog'
--- a/lisp/mh-e/ChangeLog       2012-06-01 09:51:00 +0000
+++ b/lisp/mh-e/ChangeLog       2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2012-06-01 09:51:00 +0000
+++ b/lisp/org/ChangeLog        2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-06-23 13:53:52 +0000
+++ b/lisp/url/ChangeLog        2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-23  Leo Liu  <address@hidden>
 
        * url-http.el (url-http-codes): Fix mal-formed defconst.

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2012-06-01 09:51:00 +0000
+++ b/lwlib/ChangeLog   2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-06-01 09:51:00 +0000
+++ b/msdos/ChangeLog   2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp  2012-06-01 09:51:00 +0000
+++ b/msdos/sed2v2.inp  2012-08-15 16:12:37 +0000
@@ -59,7 +59,7 @@
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
 /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
-/^#undef VERSION/s/^.*$/#define VERSION "24.1"/
+/^#undef VERSION/s/^.*$/#define VERSION "24.2"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
 /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/

=== modified file 'nextstep/ChangeLog'
--- a/nextstep/ChangeLog        2012-06-01 09:51:00 +0000
+++ b/nextstep/ChangeLog        2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'nextstep/Cocoa/Emacs.base/Contents/Info.plist'
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist     2012-06-01 09:51:00 
+0000
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist     2012-08-15 16:12:37 
+0000
@@ -553,7 +553,7 @@
        <key>CFBundleExecutable</key>
        <string>Emacs</string>
        <key>CFBundleGetInfoString</key>
-       <string>Emacs 24.1 Copyright (C) 2012 Free Software Foundation, 
Inc.</string>
+       <string>Emacs 24.2 Copyright (C) 2012 Free Software Foundation, 
Inc.</string>
        <key>CFBundleIconFile</key>
        <string>Emacs.icns</string>
        <key>CFBundleIdentifier</key>
@@ -566,7 +566,7 @@
        <string>APPL</string>
        <!-- This should be the emacs version number. -->
        <key>CFBundleShortVersionString</key>
-       <string>24.1</string>
+       <string>24.2</string>
        <key>CFBundleSignature</key>
        <string>EMAx</string>
        <!-- This SHOULD be a build number. -->

=== modified file 
'nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings'
--- 
a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings  
    2012-06-01 09:51:00 +0000
+++ 
b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings  
    2012-08-15 16:12:37 +0000
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Emacs";
-CFBundleShortVersionString = "Version 24.1";
-CFBundleGetInfoString = "Emacs version 24.1, NS Windowing";
+CFBundleShortVersionString = "Version 24.2";
+CFBundleGetInfoString = "Emacs version 24.2, NS Windowing";
 NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc.";

=== modified file 'nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop'
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop       2012-06-01 
09:51:00 +0000
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop       2012-08-15 
16:12:37 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Version=24.1
+Version=24.2
 Categories=GNUstep
 Name=Emacs
 Comment=GNU Emacs for NeXT/Open/GNUstep and OS X

=== modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist'
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist  2012-06-01 
09:51:00 +0000
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist  2012-08-15 
16:12:37 +0000
@@ -2,7 +2,7 @@
     ApplicationDescription = "GNU Emacs for GNUstep / OS X";
     ApplicationIcon = emacs.tiff;
     ApplicationName = Emacs;
-    ApplicationRelease = "24.1";
+    ApplicationRelease = "24.2";
     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.1, NS Windowing";
+    FullVersionID = "Emacs 24.2, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-06-01 09:51:00 +0000
+++ b/nt/ChangeLog      2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'nt/config.nt'
--- a/nt/config.nt      2012-06-01 09:51:00 +0000
+++ b/nt/config.nt      2012-08-15 16:12:37 +0000
@@ -331,7 +331,7 @@
 #define PACKAGE "emacs"
 
 /* Version number of package */
-#define VERSION "24.1"
+#define VERSION "24.2"
 
 /* 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.  */

=== modified file 'nt/emacs.rc'
--- a/nt/emacs.rc       2012-06-01 09:51:00 +0000
+++ b/nt/emacs.rc       2012-08-15 16:12:37 +0000
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,1,0,0
- PRODUCTVERSION 24,1,0,0
+ FILEVERSION 24,2,0,0
+ PRODUCTVERSION 24,2,0,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -25,12 +25,12 @@
        BEGIN
            VALUE "CompanyName", "Free Software Foundation\0"
            VALUE "FileDescription", "GNU Emacs: The extensible 
self-documenting text editor\0"
-           VALUE "FileVersion", "24, 1, 0, 0\0"
+           VALUE "FileVersion", "24, 2, 0, 0\0"
            VALUE "InternalName", "Emacs\0"
            VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
            VALUE "OriginalFilename", "emacs.exe"
            VALUE "ProductName", "Emacs\0"
-           VALUE "ProductVersion", "24, 1, 0, 0\0"
+           VALUE "ProductVersion", "24, 2, 0, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

=== modified file 'nt/emacsclient.rc'
--- a/nt/emacsclient.rc 2012-06-01 09:51:00 +0000
+++ b/nt/emacsclient.rc 2012-08-15 16:12:37 +0000
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,1,0,0
- PRODUCTVERSION 24,1,0,0
+ FILEVERSION 24,2,0,0
+ PRODUCTVERSION 24,2,0,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -23,12 +23,12 @@
        BEGIN
            VALUE "CompanyName", "Free Software Foundation\0"
            VALUE "FileDescription", "GNU EmacsClient: Client for the 
extensible self-documenting text editor\0"
-           VALUE "FileVersion", "24, 1, 0, 0\0"
+           VALUE "FileVersion", "24, 2, 0, 0\0"
            VALUE "InternalName", "EmacsClient\0"
            VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
            VALUE "OriginalFilename", "emacsclientw.exe"
            VALUE "ProductName", "EmacsClient\0"
-           VALUE "ProductVersion", "24, 1, 0, 0\0"
+           VALUE "ProductVersion", "24, 2, 0, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in        2012-06-01 09:51:00 +0000
+++ b/nt/makefile.w32-in        2012-08-15 16:12:37 +0000
@@ -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.1
+VERSION                = 24.2
 
 TMP_DIST_DIR   = emacs-$(VERSION)
 

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2012-06-01 09:51:00 +0000
+++ b/oldXMenu/ChangeLog        2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-14 18:43:08 +0000
+++ b/src/ChangeLog     2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-08-14  Glenn Morris  <address@hidden>
 
        * eval.c (Fcalled_interactively_p): Doc fix.  (Bug#11747)

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2012-08-14 04:04:25 +0000
+++ b/test/ChangeLog    2012-08-15 16:12:37 +0000
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <address@hidden>
+
+       * Version 24.2 released.
+
 2012-08-14  Chong Yidong  <address@hidden>
 
        * automated/files.el: Test every combination of values for


reply via email to

[Prev in Thread] Current Thread [Next in Thread]