diff options
| author | Chong Yidong | 2007-03-20 00:46:19 +0000 |
|---|---|---|
| committer | Chong Yidong | 2007-03-20 00:46:19 +0000 |
| commit | dd35811fe33b500eb4a11d5506f4d414ffeced4d (patch) | |
| tree | f0d6f7452f904e44f6036940382eacb7d81143dc | |
| parent | acc3a558d17bc4ffaaba1ec041adf4fd604a8985 (diff) | |
| download | emacs-dd35811fe33b500eb4a11d5506f4d414ffeced4d.tar.gz emacs-dd35811fe33b500eb4a11d5506f4d414ffeced4d.zip | |
Bump version to 22.0.96.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 | ||||
| -rw-r--r-- | lisp/version.el | 2 | ||||
| -rw-r--r-- | lispref/elisp.texi | 2 | ||||
| -rw-r--r-- | mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | mac/src/Emacs.r | 6 | ||||
| -rw-r--r-- | man/emacs.texi | 2 | ||||
| -rw-r--r-- | nt/emacs.rc | 8 |
8 files changed, 14 insertions, 14 deletions
| @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 | |||
| 3 | See the end of the file for license conditions. | 3 | See the end of the file for license conditions. |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | This directory tree holds version 22.0.95 of GNU Emacs, the extensible, | 6 | This directory tree holds version 22.0.96 of GNU Emacs, the extensible, |
| 7 | customizable, self-documenting real-time display editor. | 7 | customizable, self-documenting real-time display editor. |
| 8 | 8 | ||
| 9 | The file INSTALL in this directory says how to build and install GNU | 9 | The file INSTALL in this directory says how to build and install GNU |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 9229f65dd50..38e12bdb643 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs | |||
| 24 | 24 | ||
| 25 | .PHONY: $(ALL) | 25 | .PHONY: $(ALL) |
| 26 | 26 | ||
| 27 | VERSION = 22.0.95 | 27 | VERSION = 22.0.96 |
| 28 | 28 | ||
| 29 | LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ | 29 | LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ |
| 30 | -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ | 30 | -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ |
diff --git a/lisp/version.el b/lisp/version.el index e8cfcd5dcf1..f205fefbdd1 100644 --- a/lisp/version.el +++ b/lisp/version.el | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | ;;; Code: | 28 | ;;; Code: |
| 29 | 29 | ||
| 30 | (defconst emacs-version "22.0.95" "\ | 30 | (defconst emacs-version "22.0.96" "\ |
| 31 | Version numbers of this version of Emacs.") | 31 | Version numbers of this version of Emacs.") |
| 32 | 32 | ||
| 33 | (defconst emacs-major-version | 33 | (defconst emacs-major-version |
diff --git a/lispref/elisp.texi b/lispref/elisp.texi index 3b99e9eff8e..fa9f93208e1 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | @c Version of the manual and of Emacs. | 7 | @c Version of the manual and of Emacs. |
| 8 | @c Please remember to update the edition number in README as well. | 8 | @c Please remember to update the edition number in README as well. |
| 9 | @set VERSION 2.9 | 9 | @set VERSION 2.9 |
| 10 | @set EMACSVER 22.0.95 | 10 | @set EMACSVER 22.0.96 |
| 11 | 11 | ||
| 12 | @dircategory Emacs | 12 | @dircategory Emacs |
| 13 | @direntry | 13 | @direntry |
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings index 6415a2ded77..c84e392b177 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 @@ | |||
| 1 | /* Localized versions of Info.plist keys */ | 1 | /* Localized versions of Info.plist keys */ |
| 2 | 2 | ||
| 3 | CFBundleName = "Emacs"; | 3 | CFBundleName = "Emacs"; |
| 4 | CFBundleShortVersionString = "22.0.95"; | 4 | CFBundleShortVersionString = "22.0.96"; |
| 5 | CFBundleGetInfoString = "22.0.95, Copyright (C) 2007 Free Software Foundation, Inc."; | 5 | CFBundleGetInfoString = "22.0.96, Copyright (C) 2007 Free Software Foundation, Inc."; |
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index b09e216e442..f48652dd08d 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r | |||
| @@ -221,10 +221,10 @@ resource 'vers' (1) { | |||
| 221 | 0x22, /* Major revision in BCD */ | 221 | 0x22, /* Major revision in BCD */ |
| 222 | 0x0, /* Minor revision in BCD */ | 222 | 0x0, /* Minor revision in BCD */ |
| 223 | alpha, /* development, alpha, beta, or final (release) */ | 223 | alpha, /* development, alpha, beta, or final (release) */ |
| 224 | 95, /* Non-final release # */ | 224 | 96, /* Non-final release # */ |
| 225 | 0, /* Region code */ | 225 | 0, /* Region code */ |
| 226 | "22.0.95", /* Short version number */ | 226 | "22.0.96", /* Short version number */ |
| 227 | "22.0.95, Copyright \0xa9 2007 " | 227 | "22.0.96, Copyright \0xa9 2007 " |
| 228 | "Free Software Foundation, Inc." /* Long version number */ | 228 | "Free Software Foundation, Inc." /* Long version number */ |
| 229 | }; | 229 | }; |
| 230 | 230 | ||
diff --git a/man/emacs.texi b/man/emacs.texi index 961882b7a81..39416158341 100644 --- a/man/emacs.texi +++ b/man/emacs.texi | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | @c The edition number appears in several places in this file | 6 | @c The edition number appears in several places in this file |
| 7 | @set EDITION Sixteenth | 7 | @set EDITION Sixteenth |
| 8 | @set EMACSVER 22.0.95 | 8 | @set EMACSVER 22.0.96 |
| 9 | 9 | ||
| 10 | @copying | 10 | @copying |
| 11 | This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, | 11 | This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, |
diff --git a/nt/emacs.rc b/nt/emacs.rc index 60ad01bd0aa..2ec3023310a 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc | |||
| @@ -6,8 +6,8 @@ Emacs ICON icons\emacs.ico | |||
| 6 | #endif | 6 | #endif |
| 7 | 7 | ||
| 8 | VS_VERSION_INFO VERSIONINFO | 8 | VS_VERSION_INFO VERSIONINFO |
| 9 | FILEVERSION 22,0,95,0 | 9 | FILEVERSION 22,0,96,0 |
| 10 | PRODUCTVERSION 22,0,95,0 | 10 | PRODUCTVERSION 22,0,96,0 |
| 11 | FILEFLAGSMASK 0x3FL | 11 | FILEFLAGSMASK 0x3FL |
| 12 | #ifdef EMACSDEBUG | 12 | #ifdef EMACSDEBUG |
| 13 | FILEFLAGS 0x1L | 13 | FILEFLAGS 0x1L |
| @@ -24,12 +24,12 @@ BEGIN | |||
| 24 | BEGIN | 24 | BEGIN |
| 25 | VALUE "CompanyName", "Free Software Foundation\0" | 25 | VALUE "CompanyName", "Free Software Foundation\0" |
| 26 | VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" | 26 | VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" |
| 27 | VALUE "FileVersion", "22, 0, 95, 0\0" | 27 | VALUE "FileVersion", "22, 0, 96, 0\0" |
| 28 | VALUE "InternalName", "Emacs\0" | 28 | VALUE "InternalName", "Emacs\0" |
| 29 | VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0" | 29 | VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0" |
| 30 | VALUE "OriginalFilename", "emacs.exe" | 30 | VALUE "OriginalFilename", "emacs.exe" |
| 31 | VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" | 31 | VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" |
| 32 | VALUE "ProductVersion", "22, 0, 95, 0\0" | 32 | VALUE "ProductVersion", "22, 0, 96, 0\0" |
| 33 | VALUE "OLESelfRegister", "\0" | 33 | VALUE "OLESelfRegister", "\0" |
| 34 | END | 34 | END |
| 35 | END | 35 | END |