From 0106dd69c767c8f7fdecb5f6f804ecaa0094848b Mon Sep 17 00:00:00 2001
From: Chris Feng <chris.w.feng@gmail.com>
Date: Sun, 19 Nov 2017 14:44:28 +0800
Subject: [PATCH] Correct the detection of emacsclient

* exwm.el (exwm-enable): Use `daemonp' instead of `display-graphic-p'.
---
 exwm.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/exwm.el b/exwm.el
index fe10246..b64bdee 100644
--- a/exwm.el
+++ b/exwm.el
@@ -726,11 +726,10 @@
      ;; Ignore unrecognized command line arguments.  This can be helpful
      ;; when EXWM is launched by some session manager.
      (push #'vector command-line-functions)
-     (if (display-graphic-p)
-         ;; emacs.
-         (add-hook 'window-setup-hook #'exwm-init t)
-       ;; emacsclient.
-       (add-hook 'after-make-frame-functions #'exwm-init t))
+     (add-hook (if (daemonp)
+                   'after-make-frame-functions ;emacsclient
+                 'window-setup-hook)           ;emacs
+               #'exwm-init t)
      (add-hook 'kill-emacs-hook #'exwm--server-stop)
      (dolist (i exwm-blocking-subrs)
        (advice-add i :around #'exwm--server-eval-at)))))