summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-07-27 18:24:48 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-07-27 18:24:48 +0000
commit9e2a2647758db83b490e2993aa31cd4607305a82 (patch)
tree9c3d41b47bcd316c60d56bef8d7fd32789e59411 /src/emacs.c
parent7f19297073b2dd6c28987bf5663933591f59e91e (diff)
downloademacs-9e2a2647758db83b490e2993aa31cd4607305a82.tar.gz
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.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c54
1 files changed, 3 insertions, 51 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 96ae4001c39..9d1e69f600f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -351,8 +351,8 @@ int fatal_error_in_progress;
void (*fatal_error_signal_hook) P_ ((void));
#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD
-/* When compiled with GTK and running under Gnome, or Carbon under Mac
- OS X, multiple threads may be created. Keep track of our main
+/* When compiled with GTK and running under Gnome,
+ multiple threads may be created. Keep track of our main
thread to make sure signals are delivered to it (see syssignal.h). */
pthread_t main_thread;
@@ -837,7 +837,7 @@ main (argc, argv
run_time_remap (argv[0]);
#endif
-#if defined (MAC_OSX) || defined (NS_IMPL_COCOA)
+#if defined (NS_IMPL_COCOA)
if (!initialized)
unexec_init_emacs_zone ();
#endif
@@ -921,19 +921,6 @@ main (argc, argv
}
#endif
-#ifdef MAC_OSX
- /* Skip process serial number passed in the form -psn_x_y as
- command-line argument. The WindowServer adds this option when
- Emacs is invoked from the Finder or by the `open' command. In
- these cases, the working directory becomes `/', so we change it
- to the user's home directory. */
- if (argc > skip_args + 1 && strncmp (argv[skip_args+1], "-psn_", 5) == 0)
- {
- chdir (getenv ("HOME"));
- skip_args++;
- }
-#endif /* MAC_OSX */
-
#ifdef VMS
/* If -map specified, map the data file in. */
{
@@ -1284,27 +1271,6 @@ main (argc, argv
CANNOT_DUMP is defined. */
syms_of_keyboard ();
-#ifdef MAC_OS8
- /* init_window_once calls make_terminal_frame which on Mac OS
- creates a full-fledge output_mac type frame. This does not
- work correctly before syms_of_textprop, syms_of_macfns,
- syms_of_ccl, syms_of_fontset, syms_of_xterm, syms_of_search,
- syms_of_frame, mac_term_init, and init_keyboard have already
- been called. */
- syms_of_textprop ();
- syms_of_macfns ();
- syms_of_ccl ();
- syms_of_fontset ();
- syms_of_macterm ();
- syms_of_macmenu ();
- syms_of_macselect ();
- syms_of_search ();
- syms_of_frame ();
-
- init_atimer ();
- mac_term_init (build_string ("Mac"), NULL, NULL);
- init_keyboard ();
-#endif
/* Called before syms_of_fileio, because it sets up Qerror_condition. */
syms_of_data ();
syms_of_fileio ();
@@ -1508,11 +1474,6 @@ main (argc, argv
init_ntproc (); /* must precede init_editfns. */
#endif
-#if defined (MAC_OSX) && defined (HAVE_CARBON)
- if (initialized)
- init_mac_osx_environment ();
-#endif
-
#ifdef HAVE_NS
#ifndef CANNOT_DUMP
if (initialized)
@@ -1558,7 +1519,6 @@ main (argc, argv
/* The basic levels of Lisp must come first. */
/* And data must come first of all
for the sake of symbols like error-message. */
- /* Called before init_window_once for Mac OS Classic. */
syms_of_data ();
syms_of_chartab ();
syms_of_lread ();
@@ -1641,14 +1601,6 @@ main (argc, argv
syms_of_fontset ();
#endif /* HAVE_NTGUI */
-#if defined (MAC_OSX) && defined (HAVE_CARBON)
- syms_of_macterm ();
- syms_of_macfns ();
- syms_of_macmenu ();
- syms_of_macselect ();
- syms_of_fontset ();
-#endif /* MAC_OSX && HAVE_CARBON */
-
#ifdef HAVE_NS
syms_of_nsterm ();
syms_of_nsfns ();