Commit 259887e8 authored by Glenn Morris's avatar Glenn Morris
Browse files

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

Ref: http://debbugs.gnu.org/16859#15
parent 1d491ef2
2014-02-26 Glenn Morris <rgm@gnu.org> 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 Avoid calling tty-setup-hook twice, eg if a term file
explicitly calls tty-run-terminal-initialization. (Bug#16859) explicitly calls tty-run-terminal-initialization. (Bug#16859)
* faces.el (tty-run-terminal-initialization): Add run-hook argument. * faces.el (tty-run-terminal-initialization): Add run-hook argument.
......
...@@ -1285,7 +1285,8 @@ the `--debug-init' option to view a complete error backtrace." ...@@ -1285,7 +1285,8 @@ the `--debug-init' option to view a complete error backtrace."
;; Load library for our terminal type. ;; Load library for our terminal type.
;; User init file can set term-file-prefix to nil to prevent this. ;; User init file can set term-file-prefix to nil to prevent this.
(unless (or noninteractive (unless (or noninteractive
initial-window-system) initial-window-system
(daemonp))
(tty-run-terminal-initialization (selected-frame) nil t)) (tty-run-terminal-initialization (selected-frame) nil t))
;; Update the out-of-memory error message based on user's key bindings ;; Update the out-of-memory error message based on user's key bindings
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment