mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-19 18:13:55 +00:00
Code Issues Releases Activity

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

Browse Source 
Fixes: debbugs:16540
This commit is contained in:
Jan Djärv 2014-01-26 13:17:55 +01:00
parent de6a923b0b
commit 4988180d71
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -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.

4
src/xterm.c
View File

@ -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);