Merged from

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-73
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-74
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-75
   Make ERC comply with the new copyright year guidelines.

 * emacs@sv.gnu.org/emacs--devo--0--patch-76
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-77
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-78
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-79
   (rcirc-format-response-string): Fix small bugs

 * emacs@sv.gnu.org/emacs--devo--0--patch-80
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-81
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-82
   Fix compiler error in erc-dcc.el.

 * emacs@sv.gnu.org/emacs--devo--0--patch-83
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-84
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-85
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-86
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-87
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-88
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-89
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-90
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-513

1 files changed, 5 insertions, 3 deletions

diff --git a/src/xterm.c b/src/xterm.c
index afbc718d645..86e780cc611 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -325,8 +325,7 @@ static void x_set_window_size_1 P_ ((struct frame *, int, int, int));
 static const XColor *x_color_cells P_ ((Display *, int *));
 static void x_update_window_end P_ ((struct window *, int, int));
 void x_delete_display P_ ((struct x_display_info *));
-static unsigned int x_x_to_emacs_modifiers P_ ((struct x_display_info *,
-                                                unsigned));
+
 static int x_io_error_quitter P_ ((Display *));
 int x_catch_errors P_ ((Display *));
 void x_uncatch_errors P_ ((Display *, int));
@@ -3470,7 +3469,7 @@ x_find_modifier_meanings (dpyinfo)
 /* Convert between the modifier bits X uses and the modifier bits
    Emacs uses.  */
 
-static unsigned int
+unsigned int
 x_x_to_emacs_modifiers (dpyinfo, state)
      struct x_display_info *dpyinfo;
      unsigned int state;
@@ -3598,6 +3597,9 @@ note_mouse_movement (frame, event)
   last_mouse_motion_event = *event;
   XSETFRAME (last_mouse_motion_frame, frame);
 
+  if (!FRAME_X_OUTPUT (frame))
+    return 0;
+
   if (event->window != FRAME_X_WINDOW (frame))
     {
       frame->mouse_moved = 1;