[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v |
Date: |
Fri, 08 Feb 2008 15:25:58 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/02/08 15:25:58
Index: emacsclient.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- emacsclient.c 26 Jan 2008 21:27:38 -0000 1.121
+++ emacsclient.c 8 Feb 2008 15:25:58 -0000 1.122
@@ -480,15 +480,6 @@
{
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)
{
int opt = getopt_long (argc, argv,
@@ -566,13 +557,24 @@
}
}
+ /* 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)
display = NULL;
if (!tty && display)
window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
- else
+ else if (!current_frame)
tty = 1;
#endif
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Stefan Monnier, 2008/02/08
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2008/02/15
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2008/02/20
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2008/02/20
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Dan Nicolaescu, 2008/02/24