Mercurial > emacs
comparison src/dispnew.c @ 98327:d83896198aae
* lisp.h (is_daemon): Declare.
* dispnew.c (init_display): Do not try to initialize the terminal
when running as a daemon.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Wed, 24 Sep 2008 19:58:06 +0000 |
parents | 2aa441279c89 |
children | 7424f5df0da7 |
comparison
equal
deleted
inserted
replaced
98326:c5442f509109 | 98327:d83896198aae |
---|---|
6890 adjust_frame_glyphs_initially (); | 6890 adjust_frame_glyphs_initially (); |
6891 return; | 6891 return; |
6892 } | 6892 } |
6893 #endif | 6893 #endif |
6894 | 6894 |
6895 /* If running as a daemon, no need to initialize any frames/terminal. */ | |
6896 if (is_daemon) | |
6897 return; | |
6898 | |
6895 /* If no window system has been specified, try to use the terminal. */ | 6899 /* If no window system has been specified, try to use the terminal. */ |
6896 if (! isatty (0)) | 6900 if (! isatty (0)) |
6897 { | 6901 { |
6898 fatal ("standard input is not a tty"); | 6902 fatal ("standard input is not a tty"); |
6899 exit (1); | 6903 exit (1); |