* progmodes/sh-script.el (sh-mode-map): Don't assume that skeleton is

[gnu-emacs] / src / termhooks.h

diff --git a/src/termhooks.h b/src/termhooks.h
index 1be9a1b45b94b4c244b6c4633de2fc2f2b5a7f2d..71a935420d5d08b1b9ee38eaba480ad85cde31e6 100644 (file)
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -105,7 +105,7 @@ enum event_kind
   HORIZ_WHEEL_EVENT,            /* A wheel event generated by a second
                                    horizontal wheel that is present on some
                                    mice. See WHEEL_EVENT.  */
-#if defined (WINDOWSNT) || defined (MAC_OS)
+#if defined (WINDOWSNT)
   LANGUAGE_CHANGE_EVENT,       /* A LANGUAGE_CHANGE_EVENT is
                                   generated on WINDOWSNT or Mac OS
                                   when the keyboard layout or input
@@ -176,16 +176,6 @@ enum event_kind
      save yourself before shutdown. */
   SAVE_SESSION_EVENT
 
-#ifdef MAC_OS
-  /* Generated when an Apple event, a HICommand event, or a Services
-     menu event is received and the corresponding handler is
-     registered.  Members `x' and `y' are for the event class and ID
-     symbols, respectively.  Member `arg' is a Lisp object converted
-     from the received Apple event.  Parameters for non-Apple events
-     are converted to those in Apple events.  */
-  , MAC_APPLE_EVENT
-#endif
-
 #ifdef HAVE_GPM
   , GPM_CLICK_EVENT
 #endif
@@ -317,7 +307,6 @@ extern struct tty_display_info *gpm_tty;
 #endif /* CONSP */
 
 \f
-struct mac_display_info;
 struct ns_display_info;
 struct x_display_info;
 struct w32_display_info;
@@ -353,10 +342,8 @@ struct terminal
      times. */
   char *name;
 
-#ifdef MULTI_KBOARD
   /* The terminal's keyboard object. */
   struct kboard *kboard;
-#endif
 
 #ifdef HAVE_WINDOW_SYSTEM
   /* Cache of images.  */
@@ -369,7 +356,6 @@ struct terminal
     struct tty_display_info *tty;     /* termchar.h */
     struct x_display_info *x;         /* xterm.h */
     struct w32_display_info *w32;     /* w32term.h */
-    struct mac_display_info *mac;     /* macterm.h */
     struct ns_display_info *ns;       /* nsterm.h */
   } display_info;
 
@@ -642,15 +628,12 @@ extern struct terminal *terminal_list;
 #ifdef HAVE_NTGUI
 #define FRAME_WINDOW_P(f) FRAME_W32_P (f)
 #endif
-#ifdef MAC_OS
-#define FRAME_WINDOW_P(f) FRAME_MAC_P (f)
-#endif
 #ifndef FRAME_WINDOW_P
 #define FRAME_WINDOW_P(f) (0)
 #endif
 
 /* Return true if the terminal device is not suspended. */
-#define TERMINAL_ACTIVE_P(d) ((d)->type != output_termcap || (d)->display_info.tty->input)
+#define TERMINAL_ACTIVE_P(d) (((d)->type != output_termcap && (d)->type !=output_msdos_raw) || (d)->display_info.tty->input)
 
 extern Lisp_Object get_terminal_param P_ ((struct terminal *, Lisp_Object));
 extern struct terminal *get_terminal P_ ((Lisp_Object terminal, int));
@@ -660,5 +643,9 @@ extern void delete_terminal P_ ((struct terminal *));
 /* The initial terminal device, created by initial_term_init. */
 extern struct terminal *initial_terminal;
 
+#ifdef HAVE_GPM
+extern void close_gpm (void);
+#endif
+
 /* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d
    (do not change this comment) */