Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-623
   Remove RCS keywords

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

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

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

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

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

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

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-637
   Remove RCS keywords

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-201
   Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.

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

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

7 files changed, 88 insertions, 36 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 228616ba439..e9cdbdb876f 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* inc/config.h: Sync with src/config.in.
+
+2007-01-30  Piet van Oostrum  <piet@cs.uu.nl>
+
+	* make-package (compver): Install info and manpages.
+
 2006-12-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* inc/config.h: Sync with src/config.in.
@@ -32,8 +40,8 @@
 
 2006-07-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-	* makefile.MPW (dired.c.x, editfns.c.x, fileio.c.x): Depend on
-	blockinput.h.
+	* makefile.MPW (dired.c.x, editfns.c.x, fileio.c.x):
+	Depend on blockinput.h.
 
 2006-07-12  Kim F. Storm  <storm@cua.dk>
 
@@ -122,8 +130,8 @@
 	(Emacs, {DocTarget}DOC): Depend on buildobj.lst.
 	(EmacsSource, MacSource, LispSource, LispSourceDontCompile):
 	Remove variables.
-	(SOME_MACHINE_OBJECTS, shortlisp, SOME_MACHINE_LISP): New
-	variables.
+	(SOME_MACHINE_OBJECTS, shortlisp, SOME_MACHINE_LISP):
+	New variables.
 	({DocTarget}DOC): Use them.
 	(Make-DocFile-PPCCOptions): Add `-d MAC_OS -d MAC_OS8'.
 
@@ -138,7 +146,7 @@
 	(HAVE_ALLOCA, C_ALLOCA): Move from m-mac.h.
 	(PTR): Move to s-mac.h.
 
-	* inc/m-mac.h: (HAVE_ALLOCA, C_ALLOCA): Move to config.h.
+	* inc/m-mac.h (HAVE_ALLOCA, C_ALLOCA): Move to config.h.
 
 	* inc/s-mac.h: Sync with src/s/template.h.  Don't include fcntl.h,
 	time.h, or signal.h.
@@ -233,7 +241,7 @@
 
 	* src/Emacs.r: Update TOO_MUCH_RAM error message.
 
-2003-11-22  Lars Hansen <larsh@math.ku.dk>
+2003-11-22  Lars Hansen  <larsh@math.ku.dk>
 
 	* inc/grp.h: Added.
 
@@ -265,7 +273,7 @@
 
 2003-03-21  Kim F. Storm  <storm@cua.dk>
 
-	* makefile.MPW (xdisp.c.x):  Add dependency on blockinput.h and
+	* makefile.MPW (xdisp.c.x): Add dependency on blockinput.h and
 	files included from it.  Add dependency on keymap.h.
 
 2003-01-14  Steven Tamm  <steventamm@mac.com>
@@ -339,7 +347,7 @@
 
 	Option --symlink added to reduce disk size by making
 	/usr/bin/emacs and the Emacs binary inside the Emacs.app to become
-	symlinks to the	emacs-[version] binary.
+	symlinks to the emacs-[version] binary.
 
 	Option --self-contained added to place files shared files
 	inside the Emacs.app executable (for portability between systems)
@@ -869,7 +877,22 @@
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
 	2006, 2007 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  GNU Emacs is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2, or (at your option)
+  any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: c6fd43f7-0e50-4c0a-ac82-1c8a9e45a9bf
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index fec519b516e..fd6d57b84b5 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.93";
-CFBundleGetInfoString = "22.0.93, Copyright (C) 2007 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.0.94";
+CFBundleGetInfoString = "22.0.94, Copyright (C) 2007 Free Software Foundation, Inc.";
diff --git a/mac/INSTALL b/mac/INSTALL
index 35455bb030d..3711a7e1e2d 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -2,17 +2,8 @@
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
    2006, 2007 Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
-   Permission is granted to anyone to make or distribute verbatim
-   copies of this document as received, in any medium, provided that
-   the copyright notice and permission notice are preserved, and that
-   the distributor grants the recipient permission for further
-   redistribution as permitted by this notice.
-
-   Permission is granted to distribute modified versions of this
-   document, or of portions of it, under the above conditions,
-   provided also that they carry prominent notices stating who last
-   changed them.
 
 * BUILDING EMACS ON MAC OS X
 
@@ -218,3 +209,21 @@ with PowerPC builds of Emacs; you will have to recompile for Intel.
 Therefore, builds of Emacs are architecture specific.
 
 Enjoy!
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/mac/README b/mac/README
index 419ba75b043..1d8cc40e545 100644
--- a/mac/README
+++ b/mac/README
@@ -2,17 +2,8 @@ Emacs for Mac OS Classic and Mac OS X
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
    2006, 2007 Free Software Foundation, Inc.
+See the end of the file for license conditions.
 
-   Permission is granted to anyone to make or distribute verbatim
-   copies of this document as received, in any medium, provided that
-   the copyright notice and permission notice are preserved, and that
-   the distributor grants the recipient permission for further
-   redistribution as permitted by this notice.
-
-   Permission is granted to distribute modified versions of this
-   document, or of portions of it, under the above conditions,
-   provided also that they carry prominent notices stating who last
-   changed them.
 
 This directory contains the files needed to build Emacs on the Mac OS
 Classic and Mac OS X.  Many of the major features of the Unix version
@@ -53,3 +44,20 @@ emacs-pretest-bug@gnu.org.
 
 Steven
 <steven.tamm@mac.com>
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/mac/inc/config.h b/mac/inc/config.h
index 3f1aa1ed941..b9fb9a6d8cf 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -132,6 +132,10 @@ Boston, MA 02110-1301, USA.  */
    don't. */
 /* #undef HAVE_DECL_SYS_SIGLIST */
 
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
+   */
+/* #undef HAVE_DECL_TZNAME */
+
 /* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you
    don't. */
 /* #undef HAVE_DECL___SYS_SIGLIST */
@@ -256,6 +260,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `gtk_file_selection_new' function. */
 /* #undef HAVE_GTK_FILE_SELECTION_NEW */
 
+/* Define to 1 if you have the `gtk_main' function. */
+/* #undef HAVE_GTK_MAIN */
+
 /* Define to 1 if GTK can handle more than one display. */
 /* #undef HAVE_GTK_MULTIDISPLAY */
 
@@ -727,6 +734,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you're using XFree386. */
 /* #undef HAVE_XFREE386 */
 
+/* Define to 1 if you have the Xft library. */
+/* #undef HAVE_XFT */
+
 /* Define to 1 if XIM is available */
 /* #undef HAVE_XIM */
 
@@ -820,7 +830,7 @@ Boston, MA 02110-1301, USA.  */
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
+   automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
diff --git a/mac/make-package b/mac/make-package
index 2c113edbd13..a783ef40a50 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -330,6 +330,8 @@ compver=powerpc-apple-darwin`uname -r`
 if test "$self_contained" = "yes"; then
     # Move shared files down to Resources directory
     mv $installprefix/share/emacs/$version/* $installprefix
+    mv $installprefix/share/info $installprefix
+    mv $installprefix/share/man $installprefix
     rm -rf $installprefix/share
     # These directories might remain in Resources
     mv $installprefix/bin $installprefix/../MacOS/bin
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index a1a11abef06..abda6f631c7 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) */
-	93,		/* Non-final release # */
+	94,		/* Non-final release # */
 	0,		/* Region code */
-	"22.0.93",	/* Short version number */
-	"22.0.93, Copyright \0xa9 2007 "
+	"22.0.94",	/* Short version number */
+	"22.0.94, Copyright \0xa9 2007 "
 	"Free Software Foundation, Inc." /* Long version number */
 };