Fix Fwindow_text_pixel_size and fit-frame-to-buffer.

[gnu-emacs] / src / xterm.c

diff --git a/src/xterm.c b/src/xterm.c
index 105aaed297251ad19240ef96d5a8eeaef3e525f8..685fdf40a7008fc9ccb2ed6351653dec2fe0c877 100644 (file)
--- 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);