Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,

lisp/ChangeLog, and src/ChangeLog for list of changes.

ChangeLog

+2002-04-26  Andrew Choi  <akochoi@shaw.ca>
+
+	* configure.in: Add support for powerpc-apple-darwin*.
+	(HAVE_CARBON): Add.
+
+	* make-dist: create directories in mac/Emacs.app.	
+
 2002-04-25  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* make-dist: lwlib-Xol* are removed.

configure.in

@@ -128,6 +128,8 @@ AC_ARG_WITH(toolkit-scroll-bars,
                           don't use Motif or Xaw3d scroll bars])
 AC_ARG_WITH(xim,
 [  --without-xim           don't use X11 XIM])
+AC_ARG_WITH(carbon,
+[  --without-carbon        don't use Carbon GUI on Mac OS X])
 
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the path through pwd unnecessarily, since pwd can
@@ -1104,6 +1106,13 @@ case "${canonical}" in
     machine=f301 opsys=uxpv
   ;;
 
+  ## Darwin / Mac OS X
+  powerpc-apple-darwin* )
+    machine=powermac opsys=darwin
+    # Define CPP as follows to make autoconf work correctly.
+    CPP="cc -E -traditional-cpp"
+  ;;
+
   * )
     unported=yes
   ;;
@@ -1997,6 +2006,16 @@ if test "${HAVE_X11}" = "yes"; then
   fi
 fi
 
+### Use Mac OS X Carbon API to implement GUI.
+HAVE_CARBON=no
+if test "${with_carbon}" != "no"; then
+  AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
+fi
+
+if test "${HAVE_CARBON}" = "yes"; then
+  AC_DEFINE(HAVE_CARBON)
+fi
+
 ### Use session management (-lSM -lICE) if available
 HAVE_X_SM=no
 if test "${HAVE_X11}" = "yes"; then

lisp/ChangeLog

+2002-04-26  Andrew Choi  <akochoi@shaw.ca>
+
+	* term/mac-win.el: Don't call ediff-toggle-multiframe.  Set
+	default directory.  Set process-connection-type to nil.
+
 2002-04-26  Richard M. Stallman  <rms@gnu.org>
 
 	* cus-edit.el (customize-face): Use read-face-name

lisp/term/mac-win.el

@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
-;; Author: Andrew Choi <akochoi@i-cable.com>
+;; Author: Andrew Choi <akochoi@mac.com>
 
 ;; This file is part of GNU Emacs.
 
@@ -120,7 +120,7 @@
 ;; X Window emulation in macterm.c is not complete enough to start a
 ;; frame without a minibuffer properly.  Call this to tell ediff
 ;; library to use a single frame.
-(ediff-toggle-multiframe)
+; (ediff-toggle-multiframe)
 
 ;; Setup to use the Mac clipboard.  The functions mac-cut-function and
 ;; mac-paste-function are defined in mac.c.
@@ -215,6 +215,16 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 ;; big5 or sjis
 (setq file-name-coding-system 'mac-roman)
 
+;; If Emacs is started from the Finder, change the default directory
+;; to the user's home directory.
+(if (string= default-directory "/")
+    (cd "~"))
+
+;; Tell Emacs to use pipes instead of pty's for processes because the
+;; latter sometimes lose characters.  Pty support is compiled in since
+;; ange-ftp will not work without it.
+(setq process-connection-type nil)
+
 ;; (prefer-coding-system 'mac-roman)
 
 ;;

mac/ChangeLog

+2002-04-13  Andrew Choi  <akochoi@shaw.ca>
+
+	* Emacs.app/Contents/Info.plist: New file.
+
+	* Emacs.app/Contents/PkgInfo: New file.
+
+	* Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings:
+	New file.
+
+	* cw5-mcp.xml: Remove file.
+
+	* inc/defs-cw5.h: Remove file.
+
+	* cw6-mcp.xml: Update with new version.
+
+	* mac/inc/defs-cw6.h: New constant MAC_OS8.  Remove definition
+	of constant CODEWARRIOR_VERSION_6.
+
+	* mac/src/mac.c:
+	* mac/src/macmenu.c:
+	* mac/src/macterm.c:
+	Test constant __MSL__ instead of CODEWARRIOR_VERSION_6.
+
+	* src/Carbon.r: New File.
+
+	* makefile.MPW: Define MAC_OS and MAC_OS8.  Update with change of
+	locations for mac.c, macfns.c, macgui.h, macmenu.c, macterm.c, and
+	macterm.h.  Generate DOC from .el instead of .elc versions of
+	files listed in DONTCOMPILE in lisp/Makefile.in.
+	
+	* INSTALL: Add installation instructions for Mac OS X.
+
+	* README: Add information for Mac OS X.
+
+	* src/mac.c, inc/macgui.h, src/macfns.c, src/macmenu.c,
+	src/macterm.c, inc/macterm.h: Remove from here and move to src.
+
+2002-04-12  Andrew Choi  <akochoi@shaw.ca>
+
+	* src/mac.c (select): Under Carbon, always return true so
+	XTread_socket is called to poll input.
+	(run_mac_command): Not implemented under Carbon.
+	(get_wd): Call PBHGetVolSync and path_from_vol_dir_name to
+	establish pathname.
+	(do_applescript): Use Carbon routines AEGetDescDatASize and
+	AEGetDescData.
+	(Fmac_paste_function): Use Carbon routines GetCurrentScrap,
+	GetScrapFlavorFlags, GetScrapFlavorSize, and GetScrapFlavorData.
+	(Fmac_cut_function): Use Carbon routines ClearCurrentScrap,
+	GetCurrentScrap, and PutScrapFlavor.
+	(Fx_selection_exists_p): Use Carbon routines GetCurrentScrap and
+	GetScrapFlavorFlags.
+
+	* src/macfns.c: Synchronize with changes in w32fns.c.
+ 	[MAC_OSX]: Include Carbon headers.
+	(x_real_positions): Use Carbon routine GetWindowPortBounds.
+	(x_set_scroll_bar_width): Set width of scroll bar to 16.
+	(x_make_gc): Remove static qualifier.
+
+	* src/macmenu.c: Synchronize with changes in w32menu.c.
+	[MAC_OSX]: Include Carbon headers.
+	(set_frame_menubar): Check equality of vector representation of
+	scroll bars using Fequal instead of EQ.
+	(mac_menu_show): Use Carbon routine GetWindowPort.
+	(mac_dialog): Likewise.
+	(add_menu_item): Use Carbon routines CountMenuItems,
+	EnableMenuItem, and DisableMenuItem.
+
+	* src/macterm.c: Synchronize with changes in w32term.c.
+	[MAC_OSX]: Include Carbon headers.
+	(XDrawLine): Use Carbon routine GetWindowPort.
+	(XClearArea): Likewise.
+	(XClearWindow): Use Carbon routines GetWindowPort and
+	GetWindowPortBounds.
+	(mac_draw_bitmap): Use Carbon routines GetWindowPort and
+	GetPortPixMap.
+	(mac_set_clip_rectangle): Use Carbon routine GetWindowPort.
+	(mac_reset_clipping): Use Carbon routine GetWindowPort.
+	(XFillRectangle): Likewise.
+	(mac_draw_rectangle): Likewise.
+	(mac_draw_rectangle_to_pixmap): Likewise.
+	(mac_draw_string_common): Likewise.
+	(mac_copy_area): Use Carbon routines GetWindowPort and
+	GetPortPixMap.
+	(mac_scroll_area): Use Carbon routines GetWindowPort and
+	GetQDGlobalsScreenBits.
+	(x_flush): Call Carbon routine QDFlushPortBuffer.
+	(x_update_end): Use Carbon routine GetWindowPort; call x_flush.
+	(x_draw_fringe_bitmap): Call mac_reset_clipping before returning.
+	(x_draw_image_glyph_string): Likewise.
+	(x_draw_stretch_glyph_string): Likewise.
+	(construct_mouse_click): Call Carbon routine GetWindowPort.
+	(note_mouse_movement): Call Carbon routine GetWindowPortBounds.
+	(XTmouse_position): Call Carbon routine GetWindowPort.
+	(x_scroll_bar_create): Create scroll bar with proc
+	kControlScrollBarProc.
+	(XTset_vertical_scroll_bar) [MAC_OSX]: Set width to 16.
+	(activate_scroll_bar): Call ActivateControl instead of
+	SetControlMaximum.
+	(deactivate_scroll_bar): Call DeactivateControl instead of
+	SetControlMaximum.
+	(x_scroll_bar_handle_click): Use default case for scroll
+	indicator.
+	(x_scroll_bar_report_motion): Call Carbon routine GetWindowPort.
+	(x_calc_absolute_position): Call Carbon routines GetWindowPort and
+	GetWindowPortBounds.
+	(init_font_name_table): Call Carbon Font Manager routines to
+	iterate through all fonts.
+	(XLoadQueryFont): Call Carbon routines GetPortTextFont,
+	GetPortTextSize, and GetPortTextFace.
+	(do_init_managers): Do not initialize Mac Toolbox under Carbon.
+	(is_emacs_window): New function to filter out non-Emacs windows
+	passed back by WaitNextEvent.
+	(do_mouse_moved): Call Carbon routine GetWindowPort.
+	(do_apple_menu): No apple menu handler under Carbon.
+	(do_zoom_window): Call Carbon routines GetWindowPort,
+	GetQDGlobalsScreenBits, SetWindowStandardState, and
+	GetWindowPortBounds.
+	(init_required_apple_events): Use UPP procedure type converter.
+	(main): Don't define for Carbon version.
+	(XTread_socket): Don't check interrupt_input_blocked.  Don't call
+	check_alarm.  Call Carbon routines GetWindowPort,
+	GetQDGlobalScreenBits, GetWindowPortBounds, and InvalWindowRect.
+	(NewMacWindow): Set making_terminal_window to 0.  Call Carbon
+	routine GetWindowPort.
+	(mac_initialize): Rename from x_initialize.  Use new Doc string
+	format.
+
+	* inc/macterm.h: Synchronize with changes in w32term.h.
+
+	* inc/macgui.h [MAC_OSX]: Use OpaqueWindowPtr* instead of
+	WindowPtr.
+
 2002-01-28  Kim F. Storm  <storm@cua.dk>
 
 	* src/macterm.c (x_erase_phys_cursor): Don't erase cursor if

mac/Emacs.app/Contents/Info.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Emacs</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.1</string>
+</dict>
+</plist>

mac/Emacs.app/Contents/PkgInfo

+APPL????
\ No newline at end of file

mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings

+/* Localized versions of Info.plist keys */
+
+CFBundleName = "Emacs";
+CFBundleShortVersionString = "Emacs version 21";
+CFBundleGetInfoString = "Emacs version 21, Copyright 2002 FSF.";

mac/INSTALL

-* BUILDING EMACS ON THE MAC OS     -*- outline -*-
+* BUILDING EMACS ON MAC OS 8/9 AND MAC OS X     -*- outline -*-
 
-Copyright (c) 2001 Free Software Foundation, Inc.
+Copyright (c) 2001, 2002 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
@@ -13,37 +13,123 @@ Copyright (c) 2001 Free Software Foundation, Inc.
    provided also that they carry prominent notices stating who last
    changed them.
 
-You can use either Metrowerks CodeWarrior Pro 5 or 6 or MPW-GM
-(Aug. 2000) to build Emacs.
+* BUILDING EMACS ON MAC OS X
 
-You will need MPW-GM to build the make-docfile utility and to generate
-the doc string file DOC.
+You should be able to build Emacs on Mac OS X by typing the following
+commands at the top-level directory after the source distribution is
+un-tarred.
 
-To decompress files, you can use MacGzip from
+  ./configure
+  make
+  make install
 
-  http://persephone.cps.unizar.es/~spd/gzip
+The last step must be performed as root.
 
-and to untar them, you can use tar 4.0 from
+If you have X Window installed, you need to type `./configure
+--without-x' instead of `./configure'.
 
-  http://hyperarchive.lcs.mit.edu/HyperArchive/Archive/cmp/tar-40b.hqx
+You can type `make bootstrap' instead of `make' to rebuild everything,
+including byte-compiling the Lisp files.
 
-(Optional) If you wish to fetch files from the Emacs CVS repository
-directly to your Mac, you can use the CVS client MacCVS, which can be
-downloaded from
+If you have not installed the GNU texinfo package on your system, the
+build will complain that makeinfo cannot be found.  Instructions for
+installing the GNU texinfo package are given below.  Alternatively,
+you can type `make -k' instead of `make' and safely ignore the error
+messages and use the existing info files.
 
-  http://www.wincvs.org/
+After Emacs is installed, you can run it by typing `emacs -nw' from a
+terminal (make sure your path contains /usr/local/bin) or by
+double-clicking on mac/Emacs.app in the Finder.  At present,
+command-line options cannot be passed to Emacs running under the Aqua
+GUI.  This should soon be fixed.
 
-(Optional) A subset of the fonts from the GNU intlfonts-1.2
-distribution converted to NFNT format can be obtained from
+To use colors in a terminal, put the following lines in the file
+~/.termcap and log in again.
 
-  ftp://mac-emacs.sourceforge.net/pub/mac-emacs/GNU-fonts.smi.bin
+-----
+# added ANSI color
+vt100|vt100-am|vt100am|dec vt100:\
+    :pa#64:Co#8:Sf=\E[3%dm:Sb=\E[4%dm:op=\E[m:AF=\E[3%dm:AB=\E[4%dm:\
+    :do=^J:co#80:li#24:cl=\E[;H\E[2J:sf=2*\ED:\
+    :le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:\
+    :ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
+    :md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:\
+    :rf=/usr/share/tabset/vt100:\
+    :rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[;r\E[0m\E(B\E)B\E[2J:\
+    :ks=\E[?1h\E=:ke=\E[?1l\E>:\
+    :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
+    :ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
+    :sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
+-----
+
+To build a binary distribution of Emacs for Mac OS X, run the shell
+script make-bin-dist in the `mac' directory.  This will create a file
+emacs-21.xx.yy-mac-bin.tar.gz.
+
+To install the binary distribution, untar the file and run the shell
+script osx-install in its top-level directory.
+
+To build the `info' files, you need to install the texinfo software.
+
+To install from source, obtain texinfo-4.2.tar.gz from ftp.gnu.org or
+a mirror.  Un-tar it, enter its directory and type
+
+  ./configure
+  make
+  make install
+
+The last step needs to be performed as root.
+
+You may also like to install ispell, which will allow you to use
+ispell and flyspell-mode.  To install ispell from source, you first
+need to install GNU textutils.
+
+To do so, download textutils-2.0.tar.gz from ftp.gnu.org or a mirror.
+Un-tar it, enter its directory, type
+
+  ./configure --host=powerpc-apple-bsd
+  make
+  make install
+    
+Again, the last step needs to be performed as root.  Note that if you
+run `make check', the test for `pr' will fail.
+
+Get and un-tar ispell-3.2.06.tar.gz.  Look for it here:
+
+  http://fmg-www.cs.ucla.edu/geoff/ispell.html
+
+Go into its directory, type
 
-### IMPORTANT ### If you use StuffIf Expander to decompress and untar
-the distribution, you *must* set the radio button in the
+  cp local.h.samp local.h
+
+Add a line `#define TERMLIB ""' to the end of local.h.
+
+Set the environment variable TMPDIR to an existing directory.  For
+example since `/tmp' exists on my machine and I am using `bash', I
+typed
+
+  export TMPDIR=/tmp
+
+Run `make' and `make install', the latter as root.
+
+
+* BUILDING EMACS ON MAC OS 8/9
+
+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.
+
+### IMPORTANT ### You can use StuffIf Expander to decompress and untar
+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.
 
-* BUILDING EMACS
+(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
@@ -53,13 +139,11 @@ makefile.mpw.  I.e., execute the commands
   Emacs.MakeScript
 
 To build Emacs using CodeWarrior, start up the CodeWarrior IDE, choose
-File->Import Project...  and select the file cw5-mcp.xml or
-cw6-mcp.xml, depending on which verison of CodeWarrior used.  When
+File->Import Project...  and select the file cw6-mcp.xml.  When
 prompted to save the project, navigate to same directory as the file
-cw[56]-mcp.xml, name it emacs-cw5.mcp or 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.
+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.
@@ -70,35 +154,29 @@ 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.
 
-To build optimized or debugging version of Emacs in MPW, follow the
-comment in makefile.MPW to enable the -opt speed or -sym on option
-(see note below).
-
 * NOTES
 
-Emacs should build and run on a PowerMac running Mac OS 8.1 - 9.0.
+Emacs should build and run on a PowerMac running Mac OS 8.6 - 10.1.
 
 You will need around 100 MB of disk space for the source files and
 intermediate files.
 
-It will not run on machines with more than 256 MB of physical or
-virtual memory.
-
-Currently there is no support for building the LEIM directory on the
-Mac.  However, it can be built on another platform and transferred to
-the Mac.
+It will not run on machines running Mac OS 8/9 with more than 256 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.
 
-When Emacs is built with "-opt speed" enabled in makefile.MPW,
-optimization causes the functions reset_buffer_local_variables in
-buffer.c, syms_of_lread in lread.c, and x_draw_hollow_cursor in
-macterm.c to crash.  Avoid this by enclosing them in the following
-pragmas.
+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.
 
-  #pragma options opt off
+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.
 
-  <function definition...>
 
-  #pragma options opt reset
+Enjoy!
 
-To use the same icon as when Emacs is built on Windows NT, define
-GNU_ICON in mac/src/Emacs.r.
+Andrew.
+<akochoi@mac.com>

mac/README

-GNU Emacs for Mac OS
+Emacs for Mac OS 8/9 and Mac OS X
 
-Copyright (c) 2001 Free Software Foundation, Inc.
+Copyright (c) 2001, 2002 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
@@ -13,8 +13,8 @@ Copyright (c) 2001 Free Software Foundation, Inc.
    provided also that they carry prominent notices stating who last
    changed them.
 
-This directory contains the files needed to build GNU Emacs on the Mac
-OS (8.1-9.0).  Many of the major features of the Unix version are
+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.
@@ -23,24 +23,42 @@ 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 yet supported: unexec (dump-emacs), asynchronous
-subprocesses (start-process), and networking
-(open-network-stream).
+The following are not supported on Mac OS 8/9 : 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)
-although Unix commands that are used will need to be ported to the
-Mac.
+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.
 
-Metrowerks CodeWarrior Pro 5 or Pro 6 or MPW-GM (August 2000) can be
-used to build Emacs on the Mac OS.  See the INSTALL file in this
-directory for instructions on building Emacs.
+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.
 
-Binary distributions are available in
+Binary distributions will be available in
 
   ftp://ftp.gnu.org/gnu/mac/emacs/
 
-At this site you can also find an FAQ related to running GNU Emacs on
-Mac OS.
+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:
+
++ On Mac OS X, environment variables are not set up correctly when
+  Emacs is started from the Finder.
+
++ Emacs does not respond correctly to C-g when it is not reading
+  input.
+
++ No image support yet.
+
++ There is no mouse-2 and mouse-3 emulation yet.
+
+If your Mac is connected to the Internet, report bugs by typing `M-x
+report-emacs-bug' or by choosing the entry `Send Bug Report...'  in
+the `Help' menu.  This will send the bug report to the address
+emacs-pretest-bug@gnu.org.
 
 Andrew.
-<akochoi@i-cable.com>
+<akochoi@mac.com>

mac/inc/alloca.h

@@ -17,7 +17,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to the Free
 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* Contributed by Andrew Choi (akochoi@users.sourceforge.net).  */
+/* Contributed by Andrew Choi (akochoi@mac.com).  */
 
 #ifndef _ALLOCA_H_
 #define _ALLOCA_H_

mac/inc/config.h

@@ -20,6 +20,8 @@ along with GNU Emacs; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+/* Contributed by Andrew Choi (akochoi@mac.com).  */
+
 
 /* No code in Emacs #includes config.h twice, but some of the code
    intended to work with other packages as well (like gmalloc.c) 
@@ -567,4 +569,4 @@ extern char *getenv ();
 
 /* #define GLYPH_DEBUG 1 */
 
-#define NO_RETURN /* nothing */
\ No newline at end of file
+#define NO_RETURN /* nothing */

mac/inc/defs-cw5.h

-/* Copyright (C) 2001 Free Software Foundation, Inc.
-
-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., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-/* Contributed by Andrew Choi (akochoi@users.sourceforge.net).  */
-
-#define emacs 1
-#define HAVE_CONFIG_H

mac/inc/defs-cw6.h

@@ -17,9 +17,10 @@ along with GNU Emacs; see the file COPYING.  If not, write to the Free
 Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
-/* Contributed by Andrew Choi (akochoi@users.sourceforge.net).  */
+/* Contributed by Andrew Choi (akochoi@mac.com).  */
 
 #define emacs 1
 #define HAVE_CONFIG_H
 
-#define CODEWARRIOR_VERSION_6
+#define MAC_OS8 1
+#define MAC_OS 1

mac/inc/dirent.h

@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Contributed by Andrew Choi (akochoi@users.sourceforge.net).  */
+/* Contributed by Andrew Choi (akochoi@mac.com).  */
 
 #ifndef _DIRENT_H
 #define _DIRENT_H

mac/inc/epaths.h

@@ -20,7 +20,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Contributed by Andrew Choi (akochoi@users.sourceforge.net).  */
+/* Contributed by Andrew Choi (akochoi@mac.com).  */
 
 /* The default search path for Lisp function "load".
    This sets load-path.  */

mac/inc/m-mac.h

@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Contributed by Andrew Choi (akochoi@users.sourceforge.net).  */
+/* Contributed by Andrew Choi (akochoi@mac.com).  */
 
 /* The following line tells the configuration script what sort of 
    operating system this machine is likely to run.

mac/inc/pwd.h

@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Contributed by Andrew Choi (akochoi@users.sourceforge.net).  */
+/* Contributed by Andrew Choi (akochoi@mac.com).  */
 
 #ifndef _PWD_H
 #define _PWD_H

mac/inc/s-mac.h

@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,