# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1202484484 0
# Node ID cb25fa691429ddbe986ed30423b0ea845b63c693
# Parent  2b045ea84cf93dd2d7c50ffcb882aecd812f2ede
(decode_options): Fix last change so as not to override an explicit -display.

diff -r 2b045ea84cf9 -r cb25fa691429 lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Fri Feb 08 15:25:58 2008 +0000
+++ b/lib-src/emacsclient.c	Fri Feb 08 15:28:04 2008 +0000
@@ -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)