diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-08 15:28:04 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-08 15:28:04 +0000 |
| commit | 09317bf4bfaa866b1193863c2f4a0d34aa26c720 (patch) | |
| tree | 8e6e13c993e51a2875d9e9032c0684f18692f37c | |
| parent | 9997dc15294bb1d2daa1e578c180cd297d5d6f78 (diff) | |
| download | emacs-09317bf4bfaa866b1193863c2f4a0d34aa26c720.tar.gz | |
(decode_options): Fix last change so as not to override an explicit -display.
| -rw-r--r-- | lib-src/emacsclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |