From 09317bf4bfaa866b1193863c2f4a0d34aa26c720 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 8 Feb 2008 15:28:04 +0000
Subject: [PATCH] (decode_options): Fix last change so as not to override an
 explicit -display.

---
 lib-src/emacsclient.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index cfa5fa00370..a39376be3fb 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -565,7 +565,7 @@ decode_options (argc, argv)
      -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)
-- 
2.39.5