mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

Fix emacsclient/server behavior under --without-x.

Browse Source 
* 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
This commit is contained in:
Chong Yidong 2012-04-20 18:37:57 +08:00
parent de6ff46dce
commit 2d0e8e614a
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib-src/ChangeLog
View File

@ -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 <eggert@cs.ucla.edu>

8
lib-src/emacsclient.c
View File

@ -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;

2
lisp/ChangeLog
View File

@ -4,6 +4,8 @@
is a string and there are no files to open (Bug#2825).
(server-create-window-system-frame, server-create-tty-frame):
Don't switch buffers here.
(server-process-filter): Only try to open a window system frame if
compiled with graphical support (Bug#8314).
2012-04-20 Dan Nicolaescu <dann@gnu.org>

8
lisp/server.el
View File

@ -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)