aboutsummaryrefslogtreecommitdiffstats
path: root/src/termhooks.h
diff options
context:
space:
mode:
authorDan Nicolaescu2008-07-27 18:24:48 +0000
committerDan Nicolaescu2008-07-27 18:24:48 +0000
commit9e2a2647758db83b490e2993aa31cd4607305a82 (patch)
tree9c3d41b47bcd316c60d56bef8d7fd32789e59411 /src/termhooks.h
parent7f19297073b2dd6c28987bf5663933591f59e91e (diff)
downloademacs-9e2a2647758db83b490e2993aa31cd4607305a82.tar.gz
emacs-9e2a2647758db83b490e2993aa31cd4607305a82.zip
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/termhooks.h')
-rw-r--r--src/termhooks.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/termhooks.h b/src/termhooks.h
index 1be9a1b45b9..df8d48944db 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -105,7 +105,7 @@ enum event_kind
105 HORIZ_WHEEL_EVENT, /* A wheel event generated by a second 105 HORIZ_WHEEL_EVENT, /* A wheel event generated by a second
106 horizontal wheel that is present on some 106 horizontal wheel that is present on some
107 mice. See WHEEL_EVENT. */ 107 mice. See WHEEL_EVENT. */
108#if defined (WINDOWSNT) || defined (MAC_OS) 108#if defined (WINDOWSNT)
109 LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is 109 LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is
110 generated on WINDOWSNT or Mac OS 110 generated on WINDOWSNT or Mac OS
111 when the keyboard layout or input 111 when the keyboard layout or input
@@ -176,16 +176,6 @@ enum event_kind
176 save yourself before shutdown. */ 176 save yourself before shutdown. */
177 SAVE_SESSION_EVENT 177 SAVE_SESSION_EVENT
178 178
179#ifdef MAC_OS
180 /* Generated when an Apple event, a HICommand event, or a Services
181 menu event is received and the corresponding handler is
182 registered. Members `x' and `y' are for the event class and ID
183 symbols, respectively. Member `arg' is a Lisp object converted
184 from the received Apple event. Parameters for non-Apple events
185 are converted to those in Apple events. */
186 , MAC_APPLE_EVENT
187#endif
188
189#ifdef HAVE_GPM 179#ifdef HAVE_GPM
190 , GPM_CLICK_EVENT 180 , GPM_CLICK_EVENT
191#endif 181#endif
@@ -317,7 +307,6 @@ extern struct tty_display_info *gpm_tty;
317#endif /* CONSP */ 307#endif /* CONSP */
318 308
319 309
320struct mac_display_info;
321struct ns_display_info; 310struct ns_display_info;
322struct x_display_info; 311struct x_display_info;
323struct w32_display_info; 312struct w32_display_info;
@@ -369,7 +358,6 @@ struct terminal
369 struct tty_display_info *tty; /* termchar.h */ 358 struct tty_display_info *tty; /* termchar.h */
370 struct x_display_info *x; /* xterm.h */ 359 struct x_display_info *x; /* xterm.h */
371 struct w32_display_info *w32; /* w32term.h */ 360 struct w32_display_info *w32; /* w32term.h */
372 struct mac_display_info *mac; /* macterm.h */
373 struct ns_display_info *ns; /* nsterm.h */ 361 struct ns_display_info *ns; /* nsterm.h */
374 } display_info; 362 } display_info;
375 363
@@ -642,9 +630,6 @@ extern struct terminal *terminal_list;
642#ifdef HAVE_NTGUI 630#ifdef HAVE_NTGUI
643#define FRAME_WINDOW_P(f) FRAME_W32_P (f) 631#define FRAME_WINDOW_P(f) FRAME_W32_P (f)
644#endif 632#endif
645#ifdef MAC_OS
646#define FRAME_WINDOW_P(f) FRAME_MAC_P (f)
647#endif
648#ifndef FRAME_WINDOW_P 633#ifndef FRAME_WINDOW_P
649#define FRAME_WINDOW_P(f) (0) 634#define FRAME_WINDOW_P(f) (0)
650#endif 635#endif