Commit 4988180d authored by Jan Djärv's avatar Jan Djärv
Browse files

* xterm.c (x_focus_changed): Check for non-X terminal-frame

Fixes: debbugs:16540
parent de6a923b
2014-01-26 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (x_focus_changed): Check for non-X terminal-frame (Bug#16540)
2014-01-26 Paul Eggert <eggert@cs.ucla.edu>
When decoding, prefer ptrdiff_t to int for buffer positions etc.
......
......@@ -3235,7 +3235,9 @@ x_focus_changed (int type, int state, struct x_display_info *dpyinfo, struct fra
/* Don't stop displaying the initial startup message
for a switch-frame event we don't need. */
/* When run as a daemon, Vterminal_frame is always NIL. */
bufp->arg = (((NILP (Vterminal_frame) || EQ (Fdaemonp (), Qt))
bufp->arg = (((NILP (Vterminal_frame)
|| ! FRAME_X_P (XFRAME (Vterminal_frame))
|| EQ (Fdaemonp (), Qt))
&& CONSP (Vframe_list)
&& !NILP (XCDR (Vframe_list)))
? Qt : Qnil);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment