diff options
| author | Joakim Verona | 2012-10-24 13:07:12 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-10-24 13:07:12 +0200 |
| commit | fd0ea43455f2bd9c96f76b87188f0808bd6ce213 (patch) | |
| tree | 2a34edfe608adb294de5eef6678e2f9ba457c02c /src/xterm.c | |
| parent | 6d3ae671153437538da2d1b41af0d1589ec8148b (diff) | |
| parent | 4e79d09a237fe27c0a3d79ddb67642389f414614 (diff) | |
| download | emacs-fd0ea43455f2bd9c96f76b87188f0808bd6ce213.tar.gz emacs-fd0ea43455f2bd9c96f76b87188f0808bd6ce213.zip | |
upstream
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index 23685ee8ae6..a52a113ccda 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -3457,7 +3457,8 @@ x_focus_changed (int type, int state, struct x_display_info *dpyinfo, struct fra | |||
| 3457 | 3457 | ||
| 3458 | /* Don't stop displaying the initial startup message | 3458 | /* Don't stop displaying the initial startup message |
| 3459 | for a switch-frame event we don't need. */ | 3459 | for a switch-frame event we don't need. */ |
| 3460 | if (NILP (Vterminal_frame) | 3460 | /* When run as a deamon, Vterminal_frame is always NIL. */ |
| 3461 | if ((NILP (Vterminal_frame) || EQ (Fdaemonp(), Qt)) | ||
| 3461 | && CONSP (Vframe_list) | 3462 | && CONSP (Vframe_list) |
| 3462 | && !NILP (XCDR (Vframe_list))) | 3463 | && !NILP (XCDR (Vframe_list))) |
| 3463 | { | 3464 | { |