2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 96aee86932b..4ed9ef9d2cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/src/xterm.c b/src/xterm.c
index 105aaed2972..685fdf40a70 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -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);