Commit 9e2a2647 authored by Dan Nicolaescu's avatar Dan Nicolaescu

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.
parent 7f192970
2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL: Remove code for Carbon.
* configure: Regenerate.
2008-07-26 Adrian Robert <Adrian.B.Robert@gmail.com>
* Makefile.in (install-arch-dep): Fix typo in NS installation
......
......@@ -223,8 +223,7 @@ DETAILED BUILDING AND INSTALLATION:
(This is for a Unix or Unix-like system. For MS-DOS and Windows 3.X,
see below; search for MSDOG. For Windows 9X, Windows ME, Windows NT,
and Windows 2000, see the file nt/INSTALL. For the Mac, see the file
mac/INSTALL.)
and Windows 2000, see the file nt/INSTALL.)
1) Make sure your system has enough swapping space allocated to handle
a program whose pure code is 1.5 MB and whose data area is at
......
......@@ -164,9 +164,6 @@ VPATH=@srcdir@
# Where to find the application default.
x_default_search_path=@x_default_search_path@
# Location to install Emacs.app on Mac OS X
carbon_appdir=@carbon_appdir@
# Location to install Emacs.app under NeXT/Open/GNUstep / Cocoa
ns_appdir=@ns_appdir@
ns_appbindir=@ns_appbindir@
......@@ -410,12 +407,6 @@ install-arch-dep: mkdir
${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \
else true; fi ; \
done
if test "${carbon_appdir}" != ""; then \
umask 022; mkdir -p $(DESTDIR)${carbon_appdir}/Emacs.app; \
(cd mac/Emacs.app; (tar -chf - . | \
(cd $(DESTDIR)${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
&& cat > /dev/null))) || exit 1; \
fi
if test "${ns_appdir}" != ""; then \
( cd ${ns_appresdir} ; \
if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \
......
......@@ -84,8 +84,6 @@ There are several subdirectories:
`vms' holds instructions and useful files for running Emacs under VMS.
`nt' holds various command files and documentation files that pertain
to building and running Emacs on Windows 9X/ME/NT/2000/XP.
`mac' holds instructions, sources, and other useful files for building
and running Emacs on the Mac.
`test' holds tests for various aspects of Emacs's functionality.
Building Emacs on non-Posix platforms requires to install tools
......
......@@ -3,8 +3,6 @@ of their use. Feel free to add more macros and more categories.
** Distinguishing OSes **
MAC_OS8 Compiling for Mac OS Classic (v8 or v9). No longer supported, all code using it can be removed.
MAC_OSX Compiling for Mac OS X. Not bare Darwin.
CYGWIN Compiling the Cygwin port.
__CYGWIN__ Ditto
MSDOS Compiling the MS-DOS port.
......@@ -21,8 +19,6 @@ USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type inst
** Distinguishing GUIs **
HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars.
MAC_OS Compiling for the `mac' window-system.
HAVE_CARBON Compile support for the Carbon GUI. Requires MAC_OS?
HAVE_NS Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep.
NS_IMPL_GNUSTEP Compile support for GNUSTEP implementation of NS GUI API.
NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API.
......@@ -38,7 +34,6 @@ USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11.
FRAME_TERMCAP_P A tty (character terminal) frame.
FRAME_X_P A frame on X Window system.
FRAME_MSDOS_P An MS-DOS frame (used only by the DOS port).
FRAME_MAC_P A Mac frame.
FRAME_W32_P A frame using native MS-Windows GUI.
FRAME_WINDOW_P A GUI frame (like X, w32, etc.)
......
2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.
2008-07-16 Glenn Morris <rgm@gnu.org>
* admin.el (set-version, set-copyright): Add nextstep/ files.
......
......@@ -125,6 +125,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00951.html
* DOCUMENTATION
** Verify if doc/emacs/macos.texi is still useful, remove it if it is not.
** Document multi-tty features
http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01639.html
http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01602.html
......
......@@ -123,43 +123,7 @@ Root must be the root of an Emacs source tree."
(set-version-in-file root "nt/emacs.rc" comma-space-version
(rx (and "\"ProductVersion\"" (0+ space) ?,
(0+ space) ?\" (submatch (1+ (in "0-9, ")))
"\\0\"")))
;; Some files in the "mac" subdirectory also contain the version
;; number.
(set-version-in-file
root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
version (rx (and "CFBundleShortVersionString" (0+ space) ?= (0+ space) ?\"
(submatch (1+ (in "0-9."))))))
(set-version-in-file
root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\"
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "mac/src/Emacs.r" (car version-components)
(rx (and "GNU Emacs " (submatch (1+ (in "0-9")))
" for Mac OS")))
(set-version-in-file root "mac/src/Emacs.r" (car version-components)
(rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
(0+ space) "/* Major revision in BCD */")))
(set-version-in-file root "mac/src/Emacs.r" (cadr version-components)
(rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
(0+ space) "/* Minor revision in BCD */")))
(set-version-in-file root "mac/src/Emacs.r" (cadr (cdr version-components))
(rx (and (submatch (1+ (in "0-9"))) (0+ space) ?\,
(0+ space) "/* Non-final release # */")))
(set-version-in-file root "mac/src/Emacs.r" version
(rx (and (submatch (1+ (in "0-9."))) (0+ space) ?\" ?\,
(0+ space) "/* Short version number */")))
(set-version-in-file root "mac/src/Emacs.r" version
(rx (and "/* Short version number */" (0+ space) ?\"
(submatch (1+ (in "0-9."))))))
(let* ((third-component (string-to-number (cadr (cdr version-components))))
(release (cond ((>= third-component 90) "alpha")
((>= third-component 50) "development")
(t "final"))))
(set-version-in-file
root "mac/src/Emacs.r" release
(rx (and (submatch (1+ (in "a-z"))) (0+ space) ?\, (0+ space)
"/* development, alpha, beta, or final (release) */")))))
"\\0\""))))
;; nextstep.
(set-version-in-file
root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
......@@ -211,29 +175,8 @@ Root must be the root of an Emacs source tree."
(set-version-in-file root "lib-src/rcs2log" copyright
(rx (and "Copyright" (0+ space) ?= (0+ space)
?\' (submatch (1+ nonl)))))
(set-version-in-file
root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings"
copyright (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\"
(1+ anything)
(submatch "Copyright" (1+ (not (in ?\")))))))
;; This one is a nuisance, as it needs to be split over two lines.
(string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright)
(let ((csign "\\0xa9")
(cyear (match-string 1 copyright)) ; "Copyright (C) 2007 "
(owner (match-string 2 copyright))) ; "Free Software Foundation, Inc."
(set-version-in-file root "mac/src/Emacs.r"
(regexp-quote
(replace-regexp-in-string "(C)"
(regexp-quote csign) cyear))
(rx (and
(submatch "Copyright" (0+ space) (eval csign)
(0+ space) (= 4 num)
(0+ (not (in ?\")))) ?\")))
(set-version-in-file root "mac/src/Emacs.r" owner
(rx (and ?\"
(submatch (1+ (not (in ?\"))))
?\" (0+ space)
"/* Long version number */"))))
;; nextstep.
(set-version-in-file
root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
......
......@@ -23,8 +23,7 @@ For each step, check for possible errors.
6. Commit configure, README, doc/emacs/emacs.texi,
doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el,
mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings,
mac/src/Emacs.r, nt/emacs.rc. Copy lisp/loaddefs.el to
nt/emacs.rc. Copy lisp/loaddefs.el to
lisp/ldefs-boot.el and commit lisp/ldefs-boot.el. For a release,
also commit the ChangeLog files in all directories.
......
This diff is collapsed.
......@@ -141,7 +141,6 @@ OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
OPTION_DEFAULT_OFF([carbon],[use Carbon GUI on Mac OS X. This is unsupported!])
OPTION_DEFAULT_OFF([ns],[use nextstep (Cocoa or GNUstep) windowing system])
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
......@@ -170,12 +169,6 @@ if test "X${with_pkg_config_prog}" != X; then
fi
fi
AC_ARG_ENABLE(carbon-app,
[AS_HELP_STRING([--enable-carbon-app@<:@=DIR@:>@],
[specify install directory for Emacs.app on Mac OS X
[DIR=/Application]])],
[ carbon_appdir_x=${enableval}])
AC_ARG_ENABLE(cocoa-experimental-ctrl-g,
[ --enable-cocoa-experimental-ctrl-g enable experimental improved ctrl-g recognition],
EN_COCOA_EXPERIMENTAL_CTRL_G=yes,
......@@ -1214,12 +1207,6 @@ else
fi
fi
HAVE_CARBON=no
if test "${with_carbon}" != no; then
AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
test "${HAVE_CARBON}" = yes && window_system=mac
fi
HAVE_NS=no
NS_IMPL_COCOA=no
NS_IMPL_GNUSTEP=no
......@@ -1251,7 +1238,6 @@ if test "${with_ns}" != no; then
AC_CHECK_HEADER(AppKit/AppKit.h, HAVE_NS=yes)
fi
if test "${HAVE_NS}" = yes; then
test "${window_system}" = mac && HAVE_CARBON=no
window_system=nextstep
with_xft=no
with_freetype=no
......@@ -1282,7 +1268,7 @@ dnl use the toolkit if we have gtk, or X11R5 or newer.
* ) USE_X_TOOLKIT=maybe ;;
esac
;;
nextstep | mac | none )
nextstep | none )
HAVE_X_WINDOWS=no
HAVE_X11=no
USE_X_TOOLKIT=none
......@@ -1475,7 +1461,7 @@ fi
### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
HAVE_RSVG=no
if test "${HAVE_X11}" = "yes" || test "${HAVE_CARBON}" = "yes"; then
if test "${HAVE_X11}" = "yes"; then
if test "${with_rsvg}" != "no"; then
RSVG_REQUIRED=2.0.0
RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
......@@ -1751,9 +1737,6 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
elif test "${HAVE_GTK}" = "yes"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_CARBON}" = "yes"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_NS}" = "yes"; then
AC_DEFINE(USE_TOOLKIT_SCROLL_BARS)
USE_TOOLKIT_SCROLL_BARS=yes
......@@ -2051,21 +2034,6 @@ fi
dnl Check for malloc/malloc.h on darwin
AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])])
### Use Mac OS X Carbon API to implement GUI.
if test "${HAVE_CARBON}" = "yes"; then
AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
AC_CHECK_HEADERS(AvailabilityMacros.h)
## Specify the install directory
carbon_appdir=
if test "${carbon_appdir_x}" != ""; then
case ${carbon_appdir_x} in
y | ye | yes) carbon_appdir=/Applications ;;
* ) carbon_appdir=${carbon_appdir_x} ;;
esac
fi
# We also have mouse menus.
HAVE_MENUS=yes
fi
### Use NeXTstep API to implement GUI.
if test "${HAVE_NS}" = "yes"; then
AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on Mac OS X.])
......@@ -2476,7 +2444,6 @@ AC_SUBST(X_TOOLKIT_TYPE)
AC_SUBST(machfile)
AC_SUBST(opsysfile)
AC_SUBST(GETLOADAVG_LIBS)
AC_SUBST(carbon_appdir)
AC_SUBST(ns_appdir)
AC_SUBST(ns_appbindir)
AC_SUBST(ns_appresdir)
......@@ -2572,7 +2539,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
AH_BOTTOM([
/* If we're using X11/Carbon/GNUstep, define some consequences. */
#if defined HAVE_X_WINDOWS || defined(HAVE_CARBON) || defined(HAVE_NS)
#if defined(HAVE_X_WINDOWS) || defined(HAVE_NS)
#define HAVE_WINDOW_SYSTEM
#define MULTI_KBOARD
#define HAVE_MOUSE
......@@ -2589,10 +2556,6 @@ AH_BOTTOM([
#define CANNOT_DUMP
#endif
/* TODO: These are used for the Carbon port only. */
#undef MAC_OS
#undef MAC_OSX
/* Define AMPERSAND_FULL_NAME if you use the convention
that & in the full name stands for the login id. */
/* Turned on June 1996 supposing nobody will mind it. */
......@@ -2636,7 +2599,7 @@ AH_BOTTOM([
/* Set up some defines, C and LD flags for NeXTstep interface on GNUstep.
(There is probably a better place to do this, but right now the Cocoa
side does this in s/darwin.h, following the Carbon port, and we cannot
side does this in s/darwin.h and we cannot
parallel this exactly since GNUstep is multi-OS. */
#ifdef HAVE_NS
# ifdef C_SWITCH_SYSTEM
......@@ -2893,16 +2856,6 @@ if test "$USE_X_TOOLKIT" = GTK; then
esac
fi
if test "$HAVE_CARBON" = "yes"; then
echo
echo "Warning: The Mac Carbon port is currently unsupported and has
known problems. It is not recommended for use by non-developers.
The NeXTstep port (--with-ns) is an alternative.
Read the emacs-devel archives for more information."
echo
fi
if test "$HAVE_NS" = "yes"; then
echo
echo "You must run \"make install\" in order to test the built application.
......
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.
......
......@@ -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
......
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):
......
......@@ -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
......
......@@ -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
......
......@@ -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.
......
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
......
......@@ -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
......
......@@ -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
......
2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.
2008-07-24 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.
......
......@@ -53,8 +53,7 @@ Alpha (DEC) running GNU/Linux (alpha-dec-linux-gnu)
Apple Macintosh running Mac OS X
For installation on all versions of the Mac OS platform, see the file
mac/INSTALL.
For installation instructions see the file nextstep/INSTALL.
Apple PowerPC Macintosh running GNU/Linux
......
......@@ -1859,36 +1859,6 @@ is actually Xlib which won't work with libc.so.5.2.16.
Using the old library version is a workaround.
** Mac OS X
*** Mac OS X (Carbon): Environment Variables from dotfiles are ignored.
When starting Emacs from the Dock or the Finder on Mac OS X, the
environment variables that are set up in dotfiles, such as .cshrc or
.profile, are ignored. This is because the Finder and Dock are not
started from a shell, but instead from the Window Manager itself.
The workaround for this is to create a .MacOSX/environment.plist file to
setup these environment variables. These environment variables will
apply to all processes regardless of where they are started.
For me information, see http://developer.apple.com/qa/qa2001/qa1067.html.
*** Mac OS X (Carbon): Process output truncated when using ptys.
There appears to be a problem with the implementation of pty's on the
Mac OS X that causes process output to be truncated. To avoid this,
leave process-connection-type set to its default value of nil.
*** Mac OS X 10.3.9 (Carbon): QuickTime updater breaks build.
Some QuickTime updaters such as 7.0.4 and 7.2.0 are known to break
build at the link stage with the message like "Undefined symbols:
_HICopyAccessibilityActionDescription referenced from QuickTime
expected to be defined in Carbon". A workaround is to use a QuickTime
reinstaller. Alternatively, you can link with the frameworks in the
corresponding SDK by specifying LDFLAGS as
"-Wl,-F/Developer/SDKs/MacOSX10.3.0.sdk/System/Library/Frameworks".
** FreeBSD
*** FreeBSD 2.1.5: useless symbolic links remain in /tmp or other
......
2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.
2008-07-21 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in (mac-fix-env): Remove #ifdef around rule.
......
......@@ -569,7 +569,7 @@ decode_options (argc, argv)
if (!tty && display)
window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
#if !defined (WINDOWSNT)
else if (!current_frame)
tty = 1;
#endif
......
......@@ -143,7 +143,7 @@ $(BLD)/ctags.$(O): ctags.c
#
obj = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
fontset.o \
w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \
font.o w32font.o \
......
2008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
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.
2008-07-26 Adrian Robert <Adrian.B.Robert@gmail.com>
* term/ns-win.el (ns-extended-platform-support-mode): Get rid of
......
......@@ -1111,7 +1111,6 @@ ELCFILES = \
$(lisp)/tempo.elc \
$(lisp)/term.elc \
$(lisp)/term/common-win.elc \
$(lisp)/term/mac-win.elc \
$(lisp)/term/ns-win.elc \
$(lisp)/term/pc-win.elc \
$(lisp)/term/rxvt.elc \
......
......@@ -447,13 +447,6 @@
:link '(custom-manual "(emacs)Windows")
:group 'environment)
(defgroup mac nil
"Mac specific features."
:link '(custom-manual "(emacs)Mac OS")
:group 'environment
:version "22.1"
:prefix "mac-")
;;; Custom mode keymaps
(defvar custom-mode-map
......@@ -2068,7 +2061,7 @@ and `face'."
;;; The `custom' Widget.
(defface custom-button
'((((type x w32 mac ns) (class color)) ; Like default modeline
'((((type x w32 ns) (class color)) ; Like default modeline
(:box (:line-width 2 :style released-button)
:background "lightgrey" :foreground "black"))
(t
......@@ -2080,7 +2073,7 @@ and `face'."
(put 'custom-button-face 'face-alias 'custom-button)
(defface custom-button-mouse
'((((type x w32 mac ns) (class color))
'((((type x w32 ns) (class color))
(:box (:line-width 2 :style released-button)
:background "grey90" :foreground "black"))
(t
......@@ -2102,7 +2095,7 @@ and `face'."
(if custom-raised-buttons 'custom-button-mouse 'highlight))
(defface custom-button-pressed
'((((type x w32 mac ns) (class color))
'((((type x w32 ns) (class color))
(:box (:line-width 2 :style pressed-button)
:background "lightgrey" :foreground "black"))
(t
......@@ -3161,10 +3154,6 @@ OS/2 Presentation Manager.")
:sibling-args (:help-echo "\
Windows NT/9X.")
w32)
(const :format "MAC "
:sibling-args (:help-echo "\
Macintosh OS (Carbon interface).")
mac)
(const :format "NS "
:sibling-args (:help-echo "\
GNUstep or Macintosh OS Cocoa interface.")
......
......@@ -44,7 +44,7 @@
;; Create frame-local faces
(dolist (frame (frame-list))
(face-spec-set-2 face frame value)
(when (memq (window-system frame) '(x w32 mac ns))
(when (memq (window-system frame) '(x w32 ns))
(setq have-window-system t)))
;; When making a face after frames already exist
(if have-window-system
......
......@@ -200,42 +200,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(suggest-key-bindings keyboard (choice (const :tag "off" nil)
(integer :tag "time" 2)
(other :tag "on")))
;; macselect.c
(mac-dnd-known-types mac (repeat string) "22.1")