diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-04-20 18:37:57 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-04-20 18:37:57 +0800 |
| commit | 2d0e8e614a6744a6a33c6b519f20359802e75c2b (patch) | |
| tree | 1dfade2f2a21b73ee7f195c6e7e1e2f0a4c43543 /lisp/server.el | |
| parent | de6ff46dce80a715d46c34ff46f01a28afb63db9 (diff) | |
| download | emacs-2d0e8e614a6744a6a33c6b519f20359802e75c2b.tar.gz | |
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 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/server.el b/lisp/server.el index f9c8ea5c577..1e2f458ac9c 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1076,8 +1076,9 @@ The following commands are accepted by the client: ;; -window-system: Open a new X frame. (`"-window-system" - (setq dontkill t) - (setq tty-name 'window-system)) + (if (fboundp 'x-create-frame) + (setq dontkill t + tty-name 'window-system))) ;; -resume: Resume a suspended tty frame. (`"-resume" @@ -1105,7 +1106,8 @@ The following commands are accepted by the client: (setq dontkill t) (pop args-left)) - ;; -tty DEVICE-NAME TYPE: Open a new tty frame at the client. + ;; -tty DEVICE-NAME TYPE: Open a new tty frame. + ;; (But if we see -window-system later, use that.) (`"-tty" (setq tty-name (pop args-left) tty-type (pop args-left) |