Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 563-582)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 177-185)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158

3 files changed, 6 insertions, 6 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 7c8e0ed6673..225d953dfc4 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -863,7 +863,7 @@
         * src/macterm.c: New file.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit-unix
+;; coding: iso-2022-7bit
 ;; add-log-time-zone-rule: t
 ;; End:
 
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index d297cfb34ef..88098f4728f 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 = "22.0.91";
-CFBundleGetInfoString = "22.0.91, Copyright (C) 2006 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.0.92";
+CFBundleGetInfoString = "22.0.92, Copyright (C) 2006 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 73be8488f6b..37d6d0f7c39 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -221,10 +221,10 @@ resource 'vers' (1) {
         0x22,           /* Major revision in BCD */
         0x0,            /* Minor revision in BCD */
         alpha,  /* development, alpha, beta, or final (release) */
-        91,             /* Non-final release # */
+        92,             /* Non-final release # */
         0,              /* Region code */
-        "22.0.91",      /* Short version number */
-        "22.0.91, Copyright \0xa9 2006 "
+        "22.0.92",      /* Short version number */
+        "22.0.92, Copyright \0xa9 2006 "
         "Free Software Foundation, Inc." /* Long version number */
 };