[Emacs-diffs] Changes to emacs/src/xterm.c

[Jan Djärv]

Index: emacs/src/xterm.c
diff -u emacs/src/xterm.c:1.907 emacs/src/xterm.c:1.908
--- emacs/src/xterm.c:1.907     Mon Mar 20 22:41:23 2006
+++ emacs/src/xterm.c   Tue Mar 21 14:39:41 2006
@@ -10039,6 +10039,10 @@
 
 static int x_initialized;
 
+#ifdef HAVE_X_SM
+static int x_session_initialized;
+#endif
+
 #ifdef MULTI_KBOARD
 /* Test whether two display-name strings agree up to the dot that separates
    the screen number from the server number.  */
@@ -10607,7 +10611,7 @@
 
 #ifdef HAVE_X_SM
   /* Only do this for the first display.  */
-  if (x_initialized == 1)
+  if (!x_session_initialized++)
     x_session_initialize (dpyinfo);
 #endif
 
@@ -10792,6 +10796,9 @@
   last_tool_bar_item = -1;
   any_help_event_p = 0;
   ignore_next_mouse_click_timeout = 0;
+#ifdef HAVE_X_SM
+  x_session_initialized = 0;
+#endif
 
 #ifdef USE_GTK
   current_count = -1;