Fix session management detection of the first X display

* src/xterm.c (x_term_init): Check that there is no other
display in the chain instead of testing the terminal ID.

diff --git a/src/xterm.c b/src/xterm.c
index db3f41e688b762cf1fcd6d72b7a058534a8d150b..a8745894eb27bf228535422154656c24d04b36b2 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -24719,7 +24719,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
   /* Only do this for the very first display in the Emacs session.
      Ignore X session management when Emacs was first started on a
      tty or started as a daemon.  */
-  if (terminal->id == 1 && ! IS_DAEMON)
+  if (!dpyinfo->next && ! IS_DAEMON)
     x_session_initialize (dpyinfo);
 #endif