Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-708
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-709
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-710
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-711
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-712
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-713
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-714
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-715
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-716
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-717
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-718
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-719
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-720
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-721
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-722
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-723
   Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change.

 * emacs@sv.gnu.org/emacs--devo--0--patch-724
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-725
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-726
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-727
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-728
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-729
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-730
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-731
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-732
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-733
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-734
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-735
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-736
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-737
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-738
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-739
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-740
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-741
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-742
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-743
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--rel--22--base-0
   tag of emacs@sv.gnu.org/emacs--devo--0--patch-709

 * emacs@sv.gnu.org/emacs--rel--22--patch-1
   Sync to CVS tag EMACS_22_BRANCHPOINT

 * emacs@sv.gnu.org/emacs--rel--22--patch-2
   Sync to CVS branch EMACS_22_BASE

 * emacs@sv.gnu.org/emacs--rel--22--patch-3
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-4
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-5
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-6
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-7
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-8
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-9
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-10
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-11
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-12
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-13
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-217
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-218
   Merge from emacs--devo--0, emacs--rel--22

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-219
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-220
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-605

4 files changed, 22 insertions, 12 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index d427a71e5c5..17fe8e84cef 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* INSTALL: Fix description about using colors in terminal.
+	Fix typos (/Application -> /Applications).
+
+2007-04-26  Glenn Morris  <rgm@gnu.org>
+
+	* Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings:
+	* src/Emacs.r: Increase version to 22.1.50.
+
 2007-04-09  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* make-package (compver): Don't hardcode processor type.
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index c9f8190c883..fc069b9bb47 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.98";
-CFBundleGetInfoString = "22.0.98, Copyright (C) 2007 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.1.50";
+CFBundleGetInfoString = "22.1.50, Copyright (C) 2007 Free Software Foundation, Inc.";
diff --git a/mac/INSTALL b/mac/INSTALL
index 3711a7e1e2d..30dc539afab 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -21,8 +21,8 @@ must install as root using the sudo command.  However, it is not
 recommended; see the notes section below for more details.
 
 The --enable-carbon-app specifies that the Carbon GUI application
-should be installed into /Application.  If you want it to install in a
-different location, specify --enable-carbon-app=<mydir>
+should be installed into /Applications.  If you want it to install in
+a different location, specify --enable-carbon-app=<mydir>
 
 You can type `make bootstrap' instead of `make' to rebuild everything,
 including byte-compiling the Lisp files.
@@ -44,7 +44,7 @@ still meaningful.
 To start Emacs as a GUI application from the terminal, the pathname to
 the executable in the bundle, i.e.,
 
-  /Application/Emacs.app/Contents/MacOS/Emacs
+  /Applications/Emacs.app/Contents/MacOS/Emacs
 
 must be typed to the shell to enable Emacs to locate its resources
 correctly.  You may want to create an alias to this path to quickly
@@ -60,8 +60,8 @@ building Emacs to run on X Window System, you need to specify like:
 Note that the Carbon-specific functions mentioned above are not
 available on the X11-enabled build.
 
-To use colors in a terminal, put the following lines in the file
-~/.termcap and log in again.
+To use colors in Terminal.app on Mac OS X 10.1, put the following
+lines in the file ~/.termcap and log in again.
 
 -----
 # added ANSI color
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 0a17e379168..27d91b59ea0 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -219,12 +219,12 @@ resource 'FREF' (129) {
 
 resource 'vers' (1) {
 	0x22,		/* Major revision in BCD */
-	0x0,		/* Minor revision in BCD */
-	alpha,	/* development, alpha, beta, or final (release) */
-	98,		/* Non-final release # */
+	0x1,		/* Minor revision in BCD */
+	development,	/* development, alpha, beta, or final (release) */
+	50,		/* Non-final release # */
 	0,		/* Region code */
-	"22.0.98",	/* Short version number */
-	"22.0.98, Copyright \0xa9 2007 "
+	"22.1.50",	/* Short version number */
+	"22.1.50, Copyright \0xa9 2007 "
 	"Free Software Foundation, Inc." /* Long version number */
 };