From 259887e8087c39d8ccabbfbe56861e2f1fe96c91 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 26 Feb 2014 14:45:18 -0500 Subject: [PATCH] * lisp/startup.el (command-line): Don't init the tty in daemon mode. Ref: http://debbugs.gnu.org/16859#15 --- lisp/ChangeLog | 2 ++ lisp/startup.el | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 + * 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 -- 2.39.2