* fileio.c (Frename_file): Fix last change (Bug#5487).

[gnu-emacs] / src / termhooks.h

diff --git a/src/termhooks.h b/src/termhooks.h
index ed15b0f71cf5fca3a04dc38b2aee6ac18357016f..2b4011627c83fb1f15c5f0863b8d61437a5a6206 100644 (file)
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -1,6 +1,6 @@
 /* Parameters and display hooks for terminal devices.
    Copyright (C) 1985, 1986, 1993, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -184,6 +184,8 @@ enum event_kind
   , DBUS_EVENT
 #endif
 
+  , CONFIG_CHANGED_EVENT
+
 #ifdef WINDOWSNT
   /* Generated when an APPCOMMAND event is received, in response to
      Multimedia or Internet buttons on some keyboards.
@@ -198,6 +200,15 @@ enum event_kind
      first, so this is not a problem there.  */
   , MULTIMEDIA_KEY_EVENT
 #endif
+
+#ifdef HAVE_NS
+  /* Generated when native multi-keystroke input method is used to modify
+     tentative or indicative text display. */
+  , NS_TEXT_EVENT
+  /* Non-key system events (e.g. application menu events) */
+  , NS_NONKEY_EVENT
+#endif
+
 };
 
 /* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT
@@ -418,6 +429,7 @@ struct terminal
   void (*delete_glyphs_hook) P_ ((struct frame *, int));
 
   void (*ring_bell_hook) P_ ((struct frame *f));
+  void (*toggle_invisible_pointer_hook) P_ ((struct frame *f, int invisible));
 
   void (*reset_terminal_modes_hook) P_ ((struct terminal *));
   void (*set_terminal_modes_hook) P_ ((struct terminal *));
@@ -644,7 +656,7 @@ extern void delete_terminal P_ ((struct terminal *));
 extern struct terminal *initial_terminal;
 
 #ifdef HAVE_GPM
-extern void close_gpm (void);
+extern void close_gpm (int gpm_fd);
 #endif
 
 /* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d