Remove support for Mac Carbon.

* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon

* erc.el: Remove code for Carbon.

Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.

Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.

* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.

* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.

* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.

* xresources.texi: Remove mentions of Mac Carbon.

* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.

Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL:  Remove code for Carbon.
* configure: Regenerate.

9 files changed, 24 insertions, 40 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3306e285450..ae88839a50f 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xresources.texi: Remove mentions of Mac Carbon.
+
 2008-07-19  Andreas Schwab  <schwab@suse.de>
 
         * ns-emacs.texi: Move to ../misc.
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 9173de21a54..189d19569ec 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -8,10 +8,9 @@
   You can customize some X-related aspects of Emacs behavior using X
 resources, as is usual for programs that use X.  On MS-Windows, you
 can customize some of the same aspects using the system registry.
-@xref{MS-Windows Registry}.  Likewise, Emacs on MacOS Carbon emulates X
-resources using the Preferences system.  @xref{Mac Environment Variables}.
+@xref{MS-Windows Registry}.
 
-  When Emacs is built using an ``X toolkit'', such as Lucid or
+o  When Emacs is built using an ``X toolkit'', such as Lucid or
 LessTif, you need to use X resources to customize the appearance of
 the widgets, including the menu-bar, scroll-bar, and dialog boxes.
 This is because the libraries that implement these don't provide for
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 17b3b61f73e..168b9aef2a3 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * os.texi:
+        * frames.texi:
+        * display.texi: Remove mentions of Mac Carbon.
+
 2008-07-01  Miles Bader  <miles@gnu.org>
 
         * text.texi (Special Properties):
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index e7cb51072cc..eeed3821677 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1862,8 +1862,8 @@ apply to.  Here are the possible values of @var{characteristic}:
 @item type
 The kind of window system the frame uses---either @code{graphic} (any
 graphics-capable display), @code{x}, @code{pc} (for the MS-DOS console),
-@code{w32} (for MS Windows 9X/NT/2K/XP), @code{mac} (for the Macintosh
-display), or @code{tty} (a non-graphics-capable display).
+@code{w32} (for MS Windows 9X/NT/2K/XP), or @code{tty} 
+(a non-graphics-capable display).
 @xref{Window Systems, window-system}.
 
 @item class
@@ -5629,8 +5629,6 @@ Emacs is displaying using X.
 Emacs is displaying using MS-DOS.
 @item w32
 Emacs is displaying using Windows.
-@item mac
-Emacs is displaying using a Macintosh.
 @item nil
 Emacs is using a character-based terminal.
 @end table
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index da7d36daf96..9d42ada90e6 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -40,8 +40,6 @@ kind of display the frame uses:
 The frame is displayed in an X window.
 @item t
 A terminal frame on a character display.
-@item mac
-The frame is displayed on a Macintosh.
 @item w32
 The frame is displayed on MS-Windows 9X/NT.
 @item pc
@@ -1729,33 +1727,12 @@ and @code{x-set-selection} on MS-Windows support the text data type
 only; if the clipboard holds other types of data, Emacs treats the
 clipboard as empty.
 
-@cindex scrap support (for Mac OS)
-On Mac OS, selection-like data transfer between applications is
-performed through a mechanism called @dfn{scraps}.  The clipboard is a
-particular scrap named @code{com.apple.scrap.clipboard}.  Types of scrap
-data are called @dfn{scrap flavor types}, which are identified by
-four-char codes such as @code{TEXT}.  Emacs associates a selection with
-a scrap, and a selection type with a scrap flavor type via
-@code{mac-scrap-name} and @code{mac-ostype} properties, respectively.
-
-@example
-(get 'CLIPBOARD 'mac-scrap-name)
-     @result{} "com.apple.scrap.clipboard"
-(get 'com.apple.traditional-mac-plain-text 'mac-ostype)
-     @result{} "TEXT"
-@end example
-
-Conventionally, selection types for scrap flavor types on Mac OS have
-the form of @acronym{UTI, Uniform Type Identifier} such as
-@code{com.apple.traditional-mac-plain-text},
-@code{public.utf16-plain-text}, and @code{public.file-url}.
-
 @defopt x-select-enable-clipboard
 If this is non-@code{nil}, the Emacs yank functions consult the
 clipboard before the primary selection, and the kill functions store in
 the clipboard as well as the primary selection.  Otherwise they do not
 access the clipboard at all.  The default is @code{nil} on most systems,
-but @code{t} on MS-Windows and Mac.
+but @code{t} on MS-Windows.
 @end defopt
 
 @node Drag and Drop
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 7eb3c95e6ab..15458b87619 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -534,7 +534,7 @@ subprocess of Emacs.  Then you would exit the shell to return to Emacs.
 may not have a parent that can resume it again, and in any case you can
 give input to some other job such as a shell merely by moving to a
 different window.  Therefore, suspending is not allowed when Emacs is using
-a window system (X, MS Windows, or Mac).
+a window system (X, MS Windows).
 
 @defun suspend-emacs &optional string
 This function stops Emacs and returns control to the superior process.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 8fa35abc979..9ee52aebda9 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * ns-emacs.texi:
+        * faq.texi: Remove mentions of Mac Carbon.
+
 2008-07-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Saving Articles): Describe the 2nd argument of
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index a8f14cf422b..42a373d820c 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -1163,7 +1163,7 @@ machines, as well as support for the Mac OS X and Cygwin operating
 systems.
 
 @item
-The native MS-Windows, Mac OS 9 and Mac OS X builds include full support
+The native MS-Windows, and Mac OS X builds include full support
 for images, toolbar, and tooltips.
 
 @item
@@ -1359,7 +1359,7 @@ customize, with completion.
 
 In Emacs 21.1 and later, colors and faces are supported in non-windowed mode,
 i.e.@: on Unix and GNU/Linux text-only terminals and consoles, and when
-invoked as @samp{emacs -nw} on X, MS-Windows, and Mac.  (Colors and faces were
+invoked as @samp{emacs -nw} on X, and MS-Windows.  (Colors and faces were
 supported in the MS-DOS port since Emacs 19.29.)  Emacs automatically
 detects color support at startup and uses it if available.  If you think
 that your terminal supports colors, but Emacs won't use them, check the
@@ -3818,10 +3818,6 @@ menus, and multiple frames.  You can get it from
 @cindex Apple computers, Emacs for
 @cindex Macintosh, Emacs for
 
-Beginning with version 21.1, the Macintosh is supported in the official
-Emacs distribution; see the files @file{mac/README} and
-@file{mac/INSTALL} in the Emacs distribution for build instructions.
-
 Beginning with version 22.1, Emacs supports Mac OS X natively.
 
 @node Emacs for VMS and DECwindows, Modes for various languages, Emacs for Apple computers, Finding Emacs and related packages
diff --git a/doc/misc/ns-emacs.texi b/doc/misc/ns-emacs.texi
index 8b39aaa77d1..e80bf34a882 100644
--- a/doc/misc/ns-emacs.texi
+++ b/doc/misc/ns-emacs.texi
@@ -982,8 +982,7 @@ Also a number of others have contributed code.  Steve Nygard
 <nygard@@telusplanet.net> got emacs to dump under OpenStep.  The font panel
 code was Andrew Athan's <athan@@object.com> work.  Joe Reiss
 <jreiss@@magnus.acs.ohio-state.edu> both created the beautiful icons you see
-and wrote the popup menu and dialog box code as well as much else.  (Actually,
-Joe's icon became the one used for the Mac Carbon port..)
+and wrote the popup menu and dialog box code as well as much else.
 
 Finally, suggestions from Darcy Brockbank, Timothy Bissell, Scott Byer, David
 Griffiths, Scott Hess, Eberhard Mandler, John C. Randolph, and Bradley Taylor