[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/08 15:28:04

Index: emacsclient.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- emacsclient.c       8 Feb 2008 15:25:58 -0000       1.122
+++ emacsclient.c       8 Feb 2008 15:28:04 -0000       1.123
@@ -565,7 +565,7 @@
      -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)
+  if (!current_frame && !tty && !display)
     display = egetenv ("DISPLAY");
 
   if (display && strlen (display) == 0)