bug#1261: 23.0.60; diary-insert-entry and mouse-autoselect-window

[Glenn Morris]

martin rudalics wrote:

> Would it help to check popup_activated, like
>
>                 if (WINDOWP (window)
>                   && !popup_activated ()
>                   && !EQ (window, last_window)
>                   && !EQ (window, selected_window)
>
> in handle_one_xevent?

Not exactly like that, but with a tweak it seems to work (see below).
It feels a bit like covering up the real problem (gtk associating
popup with funny window), but I have no better solution; and indeed
one probably does not want to switch windows when popups are active.

I don't use mouse-autoselect-window, so Stephen please could you check
this works ok?

*** xterm.c     4 Nov 2008 16:47:34 -0000       1.1010
--- xterm.c     4 Nov 2008 18:49:39 -0000
***************
*** 6723,6729 ****
            {
  
              /* Generate SELECT_WINDOW_EVENTs when needed.  */
!             if (!NILP (Vmouse_autoselect_window))
                {
                  Lisp_Object window;
  
--- 6723,6729 ----
            {
  
              /* Generate SELECT_WINDOW_EVENTs when needed.  */
!             if (!NILP (Vmouse_autoselect_window) && !popup_activated ())
                {
                  Lisp_Object window;