* xterm.c (x_focus_changed): Check if daemonp when sending focus in

event.

Fixes: debbugs:12681

diff --git a/src/ChangeLog b/src/ChangeLog
index 979c38e4920088b32a7473e2fd080184308f253b..412e67828a794bb59cfa2bc1f7cefa39e3cf5874 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xterm.c (x_focus_changed): Check if daemonp when sending focus in
+       event (Bug#12681).
+
 2012-10-21  Glenn Morris  <rgm@gnu.org>
 
        * lisp.mk (lisp): Add cp51932.el and eucjp-ms.el.

diff --git a/src/xterm.c b/src/xterm.c
index a4c3e125d8dd2adc184a178c2b14ccec4e9a7f73..8b005873f4d136f3ef1d1c7f6df0c42515257e94 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3448,7 +3448,8 @@ 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.  */
-          if (NILP (Vterminal_frame)
+          /* When run as a deamon, Vterminal_frame is always NIL.  */
+          if ((NILP (Vterminal_frame) || EQ (Fdaemonp(), Qt))
               && CONSP (Vframe_list)
               && !NILP (XCDR (Vframe_list)))
             {