Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-551
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-552
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-553
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-554
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-555
   Remove CVS keywords from newsticker files

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-556
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-557
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-558
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-559
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-560
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-561
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-562
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-563
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-564
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-565
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-566
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-567
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-568
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-569
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-570
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-571
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-573
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-574
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-575
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-576
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-577
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-118
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-119
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-120
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-121
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-122
   Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-123
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-124
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-125
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-126
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-127
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-128
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-129
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-130
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-131
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-132
   Update from CVS

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

4 files changed, 39 insertions, 12 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index acc89f75bd..6ce6f98bc8 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,15 @@
+2005-09-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* INSTALL (NOTES): Update the list of versions of MacOS on which
+	Emacs should build.
+
+	* README: Remove a link to ftp://ftp.gnu.org/gnu/mac/emacs/ (which
+	does not exist).
+
+2005-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* inc/config.h: Sync with src/config.in.
+
 2005-07-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* Emacs.app/Contents/Info.plist (mail-to, mail-selection): New
diff --git a/mac/INSTALL b/mac/INSTALL
index c8af7e5f48..63f08b556a 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -206,7 +206,7 @@ dialog and include the Profiler PPC.Lib library.
 
 * NOTES
 
-Emacs should build and run on a PowerMac running Mac OS 8.6 - 10.3.
+Emacs should build and run on a PowerMac running Mac OS 8.6 - 10.4.
 
 You will need around 100 MB of disk space for the source files and
 intermediate files.
diff --git a/mac/README b/mac/README
index 18e0942b36..72e417d2d1 100644
--- a/mac/README
+++ b/mac/README
@@ -36,10 +36,6 @@ build Emacs on the Mac OS 8/9.  On Mac OS X, Emacs can be built using
 the Developer Tools.  See the INSTALL file in this directory for
 instructions on building Emacs.
 
-Binary distributions will be available in
-
-  ftp://ftp.gnu.org/gnu/mac/emacs/
-
 Read the Mac OS section of the on-line help to find out about how to
 use Emacs on the Mac.
 
diff --git a/mac/inc/config.h b/mac/inc/config.h
index 2bac002cc7..24fe3b30c9 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -46,11 +46,10 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if using `getloadavg.c'. */
 /* #undef C_GETLOADAVG */
 
-/* Define C_SWITCH_X_SITE to contain any special flags your compiler
-   may need to deal with X Windows.  For instance, if you've defined
-   HAVE_X_WINDOWS above and your X include files aren't in a place
-   that your compiler can find on its own, you might want to add
-   "-I/..." or something similar.  */
+/* Define C_SWITCH_X_SITE to contain any special flags your compiler may need
+   to deal with X Windows. For instance, if you've defined HAVE_X_WINDOWS
+   above and your X include files aren't in a place that your compiler can
+   find on its own, you might want to add "-I/..." or something similar. */
 /* #undef C_SWITCH_X_SITE */
 
 /* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
@@ -69,6 +68,10 @@ Boston, MA 02110-1301, USA.  */
 /* Define to the options passed to configure. */
 #define EMACS_CONFIG_OPTIONS ""
 
+/* Define to 1 if the `getloadavg' function needs to be run setuid or setgid.
+   */
+/* #undef GETLOADAVG_PRIVILEGED */
+
 /* Define to 1 if the `getpgrp' function requires zero arguments. */
 /* #undef GETPGRP_VOID */
 
@@ -104,6 +107,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `bzero' function. */
 /* #define HAVE_BZERO */
 
+/* Define to 1 if CancelMenuTracking is available (Mac OSX). */
+/* #undef HAVE_CANCELMENUTRACKING */
+
 /* Define to 1 if you are using the Carbon API on Mac OS X. */
 /* #undef HAVE_CARBON */
 
@@ -196,6 +202,12 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `getloadavg' function. */
 /* #undef HAVE_GETLOADAVG */
 
+/* Define to 1 if you have the <getopt.h> header file. */
+/* #undef HAVE_GETOPT_H */
+
+/* Define to 1 if you have the `getopt_long_only' function. */
+/* #undef HAVE_GETOPT_LONG_ONLY */
+
 /* Define to 1 if you have the `getpagesize' function. */
 /* #undef HAVE_GETPAGESIZE */
 
@@ -220,6 +232,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `getwd' function. */
 #define HAVE_GETWD 1
 
+/* Define to 1 if you have the `get_current_dir_name' function. */
+/* #undef HAVE_GET_CURRENT_DIR_NAME */
+
 /* Define to 1 if you have the ungif library (-lungif). */
 /* #undef HAVE_GIF */
 
@@ -509,7 +524,7 @@ Boston, MA 02110-1301, USA.  */
 /* #undef HAVE_SETSID */
 
 /* Define to 1 if you have the `setsockopt' function. */
-/* #undefine HAVE_SETSOCKOPT */
+/* #undef HAVE_SETSOCKOPT */
 
 /* Define to 1 if you have the `shutdown' function. */
 /* #undef HAVE_SHUTDOWN */
@@ -586,7 +601,7 @@ Boston, MA 02110-1301, USA.  */
 #define HAVE_SYS_PARAM_H 1
 
 /* Define to 1 if you have the <sys/resource.h> header file. */
-/* #undefine HAVE_SYS_RESOURCE_H */
+/* #undef HAVE_SYS_RESOURCE_H */
 
 /* Define to 1 if you have the <sys/select.h> header file. */
 /* #undef HAVE_SYS_SELECT_H */
@@ -863,6 +878,10 @@ Boston, MA 02110-1301, USA.  */
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
+/* Define to rpl_ if the getopt replacement functions and variables should be
+   used. */
+/* #undef __GETOPT_PREFIX */
+
 /* Define like PROTOTYPES; this can be used by system headers. */
 /* #undef __PROTOTYPES */