Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)

Patches applied:

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-616
   Add lisp/mh-e/.arch-inventory

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-624
   Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.

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

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

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

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

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

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

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

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

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

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

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

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

3 files changed, 56 insertions, 47 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index f4a955a7c0f..15b5855db92 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,14 @@
+2005-10-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * INSTALL: Replace `Mac OS 8/9' with `Mac OS Classic'.  Add
+        `FIXME' to descriptions about Metrowerks CodeWarrior.  Remove
+        obsolete description about 512MB limit and icon on Mac OS Classic.
+        Add description about flags for experimental features.
+
+        * README: Replace `Mac OS 8/9' with `Mac OS Classic'.  Add `FIXME'
+        to descriptions about Metrowerks CodeWarrior.  Remove obsolete
+        descriptions about C-g and supported image types.
+
 2005-10-20  Bryan D. O'Connor  <bryan@lunch.org>  (tiny change)
 
         * make-package: Add a --compressed-dist option to compress info
diff --git a/mac/INSTALL b/mac/INSTALL
index 63f08b556a5..9162ae6f08b 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,4 +1,4 @@
-* BUILDING EMACS ON MAC OS 8/9 AND MAC OS X     -*- outline -*-
+* BUILDING EMACS ON MAC OS Classic AND MAC OS X     -*- outline -*-
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
@@ -157,10 +157,11 @@ options to user
 
 For usage of other options, use the --help option.
 
-* BUILDING EMACS ON MAC OS 8/9
+* BUILDING EMACS ON MAC OS Classic
 
-You can use either Metrowerks CodeWarrior Pro 6 or MPW-GM (Aug. 2001)
-to build Emacs.  MPW-GM can be downloaded free of charge from Apple.
+FIXME: You can use either Metrowerks CodeWarrior Pro 6 or MPW-GM
+(Aug. 2001) to build Emacs.  MPW-GM can be downloaded free of charge
+from Apple.
 
 In either case, you will need MPW-GM to build the make-docfile utility
 and to generate the doc string file DOC.
@@ -170,14 +171,14 @@ the distribution.  However, you *must* set the radio button in the
 Preferences->Cross Platform->Convert text files to Macintosh format to
 "Never".  Otherwise the compiled Lisp files will be corrupted.
 
-(Optional) A subset of the fonts from the GNU intlfonts-1.2
+FIXME: (Optional) A subset of the fonts from the GNU intlfonts-1.2
 distribution converted to NFNT format can be obtained from
 
   ftp://mac-emacs.sourceforge.net/pub/mac-emacs/GNU-fonts.smi.bin
 
 To build Emacs in the MPW Shell, simply set the directory to
 ...:emacs:mac: and build the target Emacs of the make file
-makefile.mpw.  I.e., execute the commands
+makefile.MPW.  I.e., execute the commands
 
   make Emacs -f makefile.MPW > Emacs.MakeScript
   Emacs.MakeScript
@@ -186,47 +187,38 @@ The above commands create an executable that uses the Carbon API.  The
 non-Carbon version can also be created by replacing all the
 occurrences of `Emacs' above with `NonCarbon'.  Not that the
 non-Carbon version does not support some features such as file
-dialogs, drag-and-drop, and unicode menus.
+dialogs, drag-and-drop, and Unicode menus.
 
-To build Emacs using CodeWarrior, start up the CodeWarrior IDE, choose
-File->Import Project...  and select the file cw6-mcp.xml.  When
+FIXME: To build Emacs using CodeWarrior, start up the CodeWarrior IDE,
+choose File->Import Project...  and select the file cw6-mcp.xml.  When
 prompted to save the project, navigate to same directory as the file
 cw6-mcp.xml, name the project emacs-cw6.mcp, and save it there.  Then
 choose Project->Make.  Note that this does not build the DOC file.  To
 do so, use MPW and build the target "Doc" in makefile.MPW.
 
-Once built, the Emacs application (Emacs CW or Emacs MPW) can be
-launched where it is created.
+FIXME: Once built, the Emacs application (Emacs CW or Emacs MPW) can
+be launched where it is created.
 
-To build an optimized version of Emacs in CodeWarrior, change the
-value in the Emacs Settings->Code Generation->Global Optimization
+FIXME: To build an optimized version of Emacs in CodeWarrior, change
+the value in the Emacs Settings->Code Generation->Global Optimization
 dialog.  To build a version for profiling, check the Profiler
 Information box in the Emacs Settings->Code Generation->PPC Processor
 dialog and include the Profiler PPC.Lib library.
 
 * NOTES
 
-Emacs should build and run on a PowerMac running Mac OS 8.6 - 10.4.
+Emacs should build and run on a PowerMac running Mac OS 8.6 - 9.2 (but
+only tested on 9.2.2), and Mac OS X 10.1 - 10.4.
 
 You will need around 100 MB of disk space for the source files and
 intermediate files.
 
-It will not run on machines running Mac OS 8/9 with more than 512 MB
-of physical or virtual memory.  It does not have this restriction when
-it is run under Mac OS X.  But the usual 128MB buffer limit of a
-32-bit Emacs still exists.
-
-Under Mac OS 8/9, there is no support for building the LEIM directory.
-However, it can be built on Mac OS X or another platform and
-transferred to the Mac.
-
-On Mac OS 8/9, to use the same icon as when Emacs is built on Windows
-NT, define GNU_ICON in mac/src/Emacs.r.  Currently Emacs uses a
-generic application icon on the Mac OS X.  A better looking one is
-coming soon.
+Under Mac OS Classic, there is no support for building the LEIM
+directory.  However, it can be built on Mac OS X or another platform
+and transferred to the Mac.
 
 On Mac OS X, installing the emacs files in /usr can cause issues with
-system sofware updates possibly overwriting the distribution.  If this
+system software updates possibly overwriting the distribution.  If this
 is a concern, as it should be in normal binary distributions, please
 use /usr/local as the prefix for installation.
 
@@ -237,4 +229,16 @@ architectures.  In addition, Rosetta doesn't appear to work correctly
 with PowerPC builds of Emacs; you will have to recompile for Intel.
 Therefore, builds of Emacs are architecture specific.
 
+There are some compile-time flags that enable experimental features.
+Please use them at your own risk after reading the corresponding
+threads in the emacs-devel@gnu.org archive.
+
+  USE_ATSUI: Enable ATSUI (Apple Type Services for Unicode Imaging)
+  support.  Available on Mac OS 9/Carbon and Mac OS X.
+  http://lists.gnu.org/archive/html/emacs-devel/2005-10/msg00005.html
+
+  SELECT_USE_CFSOCKET: Avoid polling in sys_select (in src/mac.c).
+  Available on Mac OS X.
+  http://lists.gnu.org/archive/html/emacs-devel/2004-12/msg00789.html
+
 Enjoy!
diff --git a/mac/README b/mac/README
index 72e417d2d15..e63086050f4 100644
--- a/mac/README
+++ b/mac/README
@@ -1,4 +1,4 @@
-Emacs for Mac OS 8/9 and Mac OS X
+Emacs for Mac OS Classic and Mac OS X
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
@@ -14,40 +14,34 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    changed them.
 
 This directory contains the files needed to build Emacs on the Mac OS
-8/9 and Mac OS X.  Many of the major features of the Unix version are
-supported: multiple frames, colors, scroll bars, menu bars, use of the
-mouse, fontsets, international characters, input methods, and coding
-systems.
+Classic and Mac OS X.  Many of the major features of the Unix version
+are supported: multiple frames, colors, scroll bars, menu bars, use of
+the mouse, fontsets, international characters, input methods, and
+coding systems.
 
 Mac OS specific support includes document drag-and-drop in the Finder,
 transfer of text to and from other applications via the clipboard, and
 sending AppleScript commands to other applications from Emacs.
 
-The following are not supported on Mac OS 8/9 : unexec (dump-emacs),
+The following are not supported on Mac OS Classic: unexec (dump-emacs),
 asynchronous subprocesses (start-process), and networking
 (open-network-stream).  These features work fine on Mac OS X.
 
 There is basic support for synchronous subprocesses (call-process) on
-Mac OS 8/9 although Unix commands that are used will need to be
-ported.
+Mac OS Classic (non-Carbon build only) although Unix commands that are
+used will need to be ported.
 
-Metrowerks CodeWarrior Pro 6 or MPW-GM (August 2001) can be used to
-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.
+FIXME: Metrowerks CodeWarrior Pro 6 or MPW-GM (August 2001) can be
+used to build Emacs on the Mac OS Classic.  On Mac OS X, Emacs can be
+built using the Developer Tools.  See the INSTALL file in this
+directory for instructions on building Emacs.
 
 Read the Mac OS section of the on-line help to find out about how to
 use Emacs on the Mac.
 
 A number of things do not work yet:
 
-+ Emacs does not respond correctly to C-g under certain circumstances.  
-  Sending the Emacs process a SIGINT externally will cause it 
-  to interrupt.  This is due to the architecture of OSX's 
-  Window Manager.
-
-+ Support for certain image types (such as XPM) is not as extensive as 
-  on other plaforms. 
++ Support for PostScript image type is not available.
 
 + Incorporate Apple's wrappers to be able to create a universal 
   binary that unexecs on first run for the given architecture.