* xterm.c (XEMBED_VERSION, xembed_set_info): Don't define unless needed.

(x_fatal_error_signal): Remove; not used.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a14f36dbe745ea808a90bb8b67ac98cf097478b..cdabea5fcd2c2d7c517e50f4774b1be54aecd677 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -10,6 +10,8 @@
        Don't declare local "event" unless it's used.
        (x_iconify_frame, x_free_frame_resources): Don't declare locals
        unless they are used.
+       (XEMBED_VERSION, xembed_set_info): Don't define unless needed.
+       (x_fatal_error_signal): Remove; not used.
 
        * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
        or move locals to avoid shadowing.

diff --git a/src/xterm.c b/src/xterm.c
index 9220d84815c878fb67506fddca99718a29083c94..e64ab27092976dab489bae9f37cccc3cd81f14c4 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -279,10 +279,6 @@ Lisp_Object Qx_gtk_map_stock;
 /* Some functions take this as char *, not const char *.  */
 static char emacs_class[] = EMACS_CLASS;
 
-/* XEmbed implementation.  */
-
-#define XEMBED_VERSION 0
-
 enum xembed_info
   {
     XEMBED_MAPPED = 1 << 0
@@ -7647,17 +7643,6 @@ x_connection_signal (int signalnum)      /* If we don't have an argument, */
 
 static char *error_msg;
 
-/* Function installed as fatal_error_signal_hook in
-   x_connection_closed.  Print the X error message, and exit normally,
-   instead of dumping core when XtCloseDisplay fails.  */
-
-static void
-x_fatal_error_signal (void)
-{
-  fprintf (stderr, "%s\n", error_msg);
-  exit (70);
-}
-
 /* Handle the loss of connection to display DPY.  ERROR_MESSAGE is
    the text of an error message that lead to the connection loss.  */
 
@@ -8901,6 +8886,12 @@ XTframe_raise_lower (FRAME_PTR f, int raise_flag)
 \f
 /* XEmbed implementation.  */
 
+#if defined USE_X_TOOLKIT || ! defined USE_GTK
+
+/* XEmbed implementation.  */
+
+#define XEMBED_VERSION 0
+
 static void
 xembed_set_info (struct frame *f, enum xembed_info flags)
 {
@@ -8914,6 +8905,7 @@ xembed_set_info (struct frame *f, enum xembed_info flags)
                    dpyinfo->Xatom_XEMBED_INFO, dpyinfo->Xatom_XEMBED_INFO,
                   32, PropModeReplace, (unsigned char *) data, 2);
 }
+#endif /* defined USE_X_TOOLKIT || ! defined USE_GTK */
 
 static void
 xembed_send_message (struct frame *f, Time time, enum xembed_message message, long int detail, long int data1, long int data2)