Mercurial > emacs

diff lib-src/emacsclient.c @ 91664:cb25fa691429

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(decode_options): Fix last change so as not to override an explicit -display.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 08 Feb 2008 15:28:04 +0000
parents 2b045ea84cf9
children e05f6258e35f
line wrap: on
line diff
--- 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)