Commit 09317bf4 authored by Stefan Monnier's avatar Stefan Monnier

(decode_options): Fix last change so as not to override an explicit -display.

parent 9997dc15
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment