emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r116568: * lisp/startup.el (command-line): Don't ini


From: Glenn Morris
Subject: [Emacs-diffs] trunk r116568: * lisp/startup.el (command-line): Don't init the tty in daemon mode.
Date: Wed, 26 Feb 2014 19:45:21 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 116568
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-26 14:45:18 -0500
message:
  * lisp/startup.el (command-line): Don't init the tty in daemon mode.
  
  Ref: http://debbugs.gnu.org/16859#15
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/startup.el                startup.el-20091113204419-o5vbwnq5f7feedwu-260
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-26 19:40:56 +0000
+++ b/lisp/ChangeLog    2014-02-26 19:45:18 +0000
@@ -1,5 +1,7 @@
 2014-02-26  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2014-02-26 19:40:56 +0000
+++ b/lisp/startup.el   2014-02-26 19:45:18 +0000
@@ -1285,7 +1285,8 @@
   ;; 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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]