* lisp/startup.el (command-line): Don't init the tty in daemon mode.

Ref: http://debbugs.gnu.org/16859#15

2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 510784e459a..cee4d322d69 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-02-26  Glenn Morris  <rgm@gnu.org>
 
+        * startup.el (command-line): Don't init the tty in daemon mode.
+
         Avoid calling tty-setup-hook twice, eg if a term file
         explicitly calls tty-run-terminal-initialization.  (Bug#16859)
         * faces.el (tty-run-terminal-initialization): Add run-hook argument.
diff --git a/lisp/startup.el b/lisp/startup.el
index 531cba2af55..d6d0ff9bd42 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1285,7 +1285,8 @@ the `--debug-init' option to view a complete error backtrace."
   ;; Load library for our terminal type.
   ;; User init file can set term-file-prefix to nil to prevent this.
   (unless (or noninteractive
-              initial-window-system)
+              initial-window-system
+              (daemonp))
     (tty-run-terminal-initialization (selected-frame) nil t))
 
   ;; Update the out-of-memory error message based on user's key bindings