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

This commit is contained in:
Stefan Monnier 2008-02-08 15:28:04 +00:00
parent 9997dc1529
commit 09317bf4bf

View file

@ -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)