[Emacs-diffs] trunk r116164: * xterm.c (x_focus_changed): Check for non-X terminal-frame

[Jan D.]

------------------------------------------------------------
revno: 116164
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16540
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2014-01-26 13:17:55 +0100
message:
  * xterm.c (x_focus_changed): Check for non-X terminal-frame
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-01-26 01:20:24 +0000
+++ b/src/ChangeLog     2014-01-26 12:17:55 +0000
@@ -1,3 +1,7 @@
+2014-01-26  Jan Djärv  <address@hidden>
+
+       * xterm.c (x_focus_changed): Check for non-X terminal-frame (Bug#16540)
+
 2014-01-26  Paul Eggert  <address@hidden>
 
        When decoding, prefer ptrdiff_t to int for buffer positions etc.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2014-01-11 09:31:09 +0000
+++ b/src/xterm.c       2014-01-26 12:17:55 +0000
@@ -3235,7 +3235,9 @@
           /* 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);