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

(decode_options): Pass --display implicitly if -c

Browse Source 
is specified.  Only set tty if -t or -c is specified.
This commit is contained in:
Stefan Monnier 2008-02-08 15:25:58 +00:00
parent fe243f8ee2
commit 9997dc1529
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib-src/ChangeLog
View File

@ -1,3 +1,8 @@
2008-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* emacsclient.c (decode_options): Pass --display implicitly if -c
is specified. Only set tty if -t or -c is specified.
2008-02-04 Jason Rumney <jasonr@gnu.org> 2008-02-04 Jason Rumney <jasonr@gnu.org>
* makefile.w32-in (lisp1): Use (), not {}. * makefile.w32-in (lisp1): Use (), not {}.

22
lib-src/emacsclient.c
View File

@ -480,15 +480,6 @@ decode_options (argc, argv)
{ {
alternate_editor = egetenv ("ALTERNATE_EDITOR"); alternate_editor = egetenv ("ALTERNATE_EDITOR");
/* We used to set `display' to $DISPLAY by default, but this changed the
default behavior and is sometimes inconvenient. So instead of forcing
users to say "--display ''" when they want to use Emacs's existing tty
or display connection, we force them to use "--display $DISPLAY" if
they want Emacs to connect to their current display. */
#if 0
display = egetenv ("DISPLAY");
#endif
while (1) while (1)
{ {
int opt = getopt_long (argc, argv, int opt = getopt_long (argc, argv,
@ -566,13 +557,24 @@ decode_options (argc, argv)
} }
} }
/* We used to set `display' to $DISPLAY by default, but this changed the
default behavior and is sometimes inconvenient. So instead of forcing
users to say "--display ''" when they want to use Emacs's existing tty
or display connection, we force them to use "--display $DISPLAY" if
they want Emacs to connect to their current display.
-c still implicitly passes --display $DISPLAY unless -t was specified
so as to try and mimick the behavior of `emacs' which either uses
the current tty or the current $DISPLAY. */
if (!current_frame && !tty)
display = egetenv ("DISPLAY");
if (display && strlen (display) == 0) if (display && strlen (display) == 0)
display = NULL; display = NULL;
if (!tty && display) if (!tty && display)
window_system = 1; window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON) #if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
else else if (!current_frame)
tty = 1; tty = 1;
#endif #endif