diff options
| author | Chong Yidong <[email protected]> | 2012-04-20 18:37:57 +0800 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2012-04-20 18:37:57 +0800 |
| commit | 2d0e8e614a6744a6a33c6b519f20359802e75c2b (patch) | |
| tree | 1dfade2f2a21b73ee7f195c6e7e1e2f0a4c43543 /lib-src | |
| parent | de6ff46dce80a715d46c34ff46f01a28afb63db9 (diff) | |
Fix emacsclient/server behavior under --without-x.
* lib-src/emacsclient.c (main): Send -tty to Emacs under more circumstanced (Bug#8314).
* lisp/server.el (server-process-filter): Only try to open a window
system frame if compiled with graphical support (Bug#8314).
Fixes: debbugs:11102
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 1 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c76303d8fa..fc6d905cfb 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -2,6 +2,7 @@ * emacsclient.c (decode_options): Move -t -n corner case handling into server.el (Bug#11102). + (main): Send -tty to Emacs under more circumstanced (Bug#8314). 2012-04-18 Paul Eggert <[email protected]> diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 48b4384d48..ea55398306 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1658,10 +1658,10 @@ main (int argc, char **argv) send_to_emacs (emacs_socket, " "); } - /* If using the current frame, send tty information to Emacs anyway. - In daemon mode, Emacs may need to occupy this tty if no other - frame is available. */ - if (tty || (current_frame && !eval)) + /* Unless we are certain we don't want to occupy the tty, send our + tty information to Emacs. For example, in daemon mode Emacs may + need to occupy this tty if no other frame is available. */ + if (!current_frame || !eval) { const char *tty_type, *tty_name; |