aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorJoakim Verona2012-11-06 23:01:10 +0100
committerJoakim Verona2012-11-06 23:01:10 +0100
commit643b1893347ee5c32f6174d0f76a55d723060123 (patch)
tree06847c9375f32e91446bfdbe9aa342cb232be90f /src/xterm.c
parent9c809558c18410acf9b90529e183d192afca3d2c (diff)
parentb6b3b29458fefcf7f31a0b14d6484cf262db2e54 (diff)
downloademacs-643b1893347ee5c32f6174d0f76a55d723060123.tar.gz
emacs-643b1893347ee5c32f6174d0f76a55d723060123.zip
upstream
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c
index a52a113ccda..a36b008c105 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3457,7 +3457,7 @@ x_focus_changed (int type, int state, struct x_display_info *dpyinfo, struct fra
3457 3457
3458 /* Don't stop displaying the initial startup message 3458 /* Don't stop displaying the initial startup message
3459 for a switch-frame event we don't need. */ 3459 for a switch-frame event we don't need. */
3460 /* When run as a deamon, Vterminal_frame is always NIL. */ 3460 /* When run as a daemon, Vterminal_frame is always NIL. */
3461 if ((NILP (Vterminal_frame) || EQ (Fdaemonp(), Qt)) 3461 if ((NILP (Vterminal_frame) || EQ (Fdaemonp(), Qt))
3462 && CONSP (Vframe_list) 3462 && CONSP (Vframe_list)
3463 && !NILP (XCDR (Vframe_list))) 3463 && !NILP (XCDR (Vframe_list)))
@@ -6117,7 +6117,6 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
6117 SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display; 6117 SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display;
6118 SELECTION_EVENT_SELECTION (&inev.sie) = eventp->selection; 6118 SELECTION_EVENT_SELECTION (&inev.sie) = eventp->selection;
6119 SELECTION_EVENT_TIME (&inev.sie) = eventp->time; 6119 SELECTION_EVENT_TIME (&inev.sie) = eventp->time;
6120 inev.ie.frame_or_window = Qnil;
6121 } 6120 }
6122 break; 6121 break;
6123 6122
@@ -6137,7 +6136,6 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
6137 SELECTION_EVENT_TARGET (&inev.sie) = eventp->target; 6136 SELECTION_EVENT_TARGET (&inev.sie) = eventp->target;
6138 SELECTION_EVENT_PROPERTY (&inev.sie) = eventp->property; 6137 SELECTION_EVENT_PROPERTY (&inev.sie) = eventp->property;
6139 SELECTION_EVENT_TIME (&inev.sie) = eventp->time; 6138 SELECTION_EVENT_TIME (&inev.sie) = eventp->time;
6140 inev.ie.frame_or_window = Qnil;
6141 } 6139 }
6142 break; 6140 break;
6143 6141