[Emacs-diffs] /srv/bzr/emacs/trunk r110612: * xterm.c (x_focus_changed): Check if daemonp when sending focus in

[Jan D.]

------------------------------------------------------------
revno: 110612
fixes bug: http://debbugs.gnu.org/12681
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-21 16:53:28 +0200
message:
  * xterm.c (x_focus_changed): Check if daemonp when sending focus in
  event.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-21 01:19:46 +0000
+++ b/src/ChangeLog     2012-10-21 14:53:28 +0000
@@ -1,3 +1,8 @@
+2012-10-21  Jan Djärv  <address@hidden>
+
+       * xterm.c (x_focus_changed): Check if daemonp when sending focus in
+       event (Bug#12681).
+
 2012-10-21  Glenn Morris  <address@hidden>
 
        * lisp.mk (lisp): Add cp51932.el and eucjp-ms.el.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-10-01 06:36:54 +0000
+++ b/src/xterm.c       2012-10-21 14:53:28 +0000
@@ -3448,7 +3448,8 @@
 
           /* 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)))
             {