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

[Jan Djärv]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.710 emacs/src/xterm.c:1.711
*** emacs/src/xterm.c:1.710     Mon Mar  4 18:40:59 2002
--- emacs/src/xterm.c   Sun Mar 10 11:15:20 2002
***************
*** 10032,10037 ****
--- 10032,10043 ----
          x_io_error_quitter (dpyinfo->display);
        }
  
+ #ifdef HAVE_X_SM
+       BLOCK_INPUT;
+       count += x_session_check_input (bufp, &numchars);
+       UNBLOCK_INPUT;
+ #endif
+ 
        while (XPending (dpyinfo->display))
        {
          XNextEvent (dpyinfo->display, &event);
***************
*** 10114,10124 ****
                           the session manager, who's looking for such a
                           PropertyNotify.  Can restart processing when
                           a keyboard or mouse event arrives.  */
!                       if (numchars > 0)
                          {
                            f = x_top_window_to_frame (dpyinfo,
                                                       event.xclient.window);
- 
                            /* This is just so we only give real data once
                               for a single Emacs process.  */
                            if (f == SELECTED_FRAME ())
--- 10120,10136 ----
                           the session manager, who's looking for such a
                           PropertyNotify.  Can restart processing when
                           a keyboard or mouse event arrives.  */
!                         /* If we have a session manager, don't set this.
!                            KDE will then start two Emacsen, one for the
!                            session manager and one for this. */
!                       if (numchars > 0
! #ifdef HAVE_X_SM
!                             && ! x_session_have_connection ()
! #endif
!                             )
                          {
                            f = x_top_window_to_frame (dpyinfo,
                                                       event.xclient.window);
                            /* This is just so we only give real data once
                               for a single Emacs process.  */
                            if (f == SELECTED_FRAME ())
***************
*** 15056,15061 ****
--- 15068,15077 ----
  #endif /* ! defined (SIGWINCH) */
  
    signal (SIGPIPE, x_connection_signal);
+ 
+ #ifdef HAVE_X_SM
+   x_session_initialize ();
+ #endif
  }