From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 21 Oct 2012 14:53:28 +0000 (+0200)
Subject: * xterm.c (x_focus_changed): Check if daemonp when sending focus in
X-Git-Tag: emacs-24.2.90~211^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ec86886a75267e8fafe26102d32055d1376808b;p=emacs.git

* 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 979c38e4920..412e67828a7 100644
--- 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 a4c3e125d8d..8b005873f4d 100644
--- 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)))
             {